diff --git a/.editorconfig b/.editorconfig index 75c34374130..43970edebe5 100644 --- a/.editorconfig +++ b/.editorconfig @@ -57,10 +57,13 @@ indent_size = unset [deps.nix] insert_final_newline = unset +[eggs.nix] +trim_trailing_whitespace = unset + [gemset.nix] insert_final_newline = unset -[node-packages.nix] +[node-{composition,packages}.nix] insert_final_newline = unset [nixos/modules/services/networking/ircd-hybrid/*.{conf,in}] @@ -102,5 +105,8 @@ insert_final_newline = unset indent_size = unset trim_trailing_whitespace = unset +[pkgs/top-level/emscripten-packages.nix] +trim_trailing_whitespace = unset + [pkgs/top-level/perl-packages.nix] indent_size = unset diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml new file mode 100644 index 00000000000..98c7afbab78 --- /dev/null +++ b/.github/workflows/editorconfig.yml @@ -0,0 +1,27 @@ +name: "Checking EditorConfig" + +on: + pull_request: + +jobs: + tests: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - uses: technote-space/get-diff-action@v3.1.0 + - name: Fetch editorconfig-checker + if: env.GIT_DIFF + env: + ECC_VERSION: "2.1.0" + ECC_URL: "https://github.com/editorconfig-checker/editorconfig-checker/releases/download" + run: | + curl -sSf -O -L -C - "$ECC_URL/$ECC_VERSION/ec-linux-amd64.tar.gz" && \ + tar xzf ec-linux-amd64.tar.gz && \ + mv ./bin/ec-linux-amd64 ./bin/editorconfig-checker + - name: Checking EditorConfig + if: env.GIT_DIFF + run: | + ./bin/editorconfig-checker -disable-indentation \ + ${{ env.GIT_DIFF }} diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 4ccb8483430..fb90e62769f 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -35,6 +35,10 @@ lua-cmsgpack,,,,, lua-iconv,,,,, lua-lsp,,http://luarocks.org/dev,,, lua-messagepack,,,,, +lua-resty-http,,,,, +lua-resty-jwt,,,,, +lua-resty-openidc,,,,, +lua-resty-session,,,,, lua-term,,,,, lua-toml,,,,, lua-zlib,,,,,koral diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 612bb02aaa9..93f94587c0a 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -1,14 +1,19 @@ #! /somewhere/python3 +from contextlib import contextmanager, _GeneratorContextManager +from queue import Queue, Empty +from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List +from xml.sax.saxutils import XMLGenerator +import queue +import io +import _thread import argparse import atexit import base64 -import io -import itertools -import logging +import codecs import os import pathlib +import ptpython.repl import pty -import queue import re import shlex import shutil @@ -16,12 +21,9 @@ import socket import subprocess import sys import tempfile -import _thread import time -from contextlib import contextmanager -from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple - -import ptpython.repl +import traceback +import unicodedata CHAR_TO_KEY = { "A": "shift-a", @@ -86,24 +88,13 @@ CHAR_TO_KEY = { ")": "shift-0x0B", } -# Forward reference +# Forward references +log: "Logger" machines: "List[Machine]" -logging.basicConfig(format="%(message)s") -logger = logging.getLogger("test-driver") -logger.setLevel(logging.INFO) -machine_colours_iter = ( - "\x1b[{}m".format(x) for x in itertools.cycle(reversed(range(31, 37))) -) - - -class MachineLogAdapter(logging.LoggerAdapter): - def process(self, msg: str, kwargs: Any) -> Tuple[str, Any]: - return ( - f"{self.extra['colour_code']}{self.extra['machine']}\x1b[39m: {msg}", - kwargs, - ) +def eprint(*args: object, **kwargs: Any) -> None: + print(*args, file=sys.stderr, **kwargs) def make_command(args: list) -> str: @@ -111,7 +102,8 @@ def make_command(args: list) -> str: def create_vlan(vlan_nr: str) -> Tuple[str, str, "subprocess.Popen[bytes]", Any]: - logger.info(f"starting VDE switch for network {vlan_nr}") + global log + log.log("starting VDE switch for network {}".format(vlan_nr)) vde_socket = tempfile.mkdtemp( prefix="nixos-test-vde-", suffix="-vde{}.ctl".format(vlan_nr) ) @@ -150,6 +142,70 @@ def retry(fn: Callable) -> None: raise Exception("action timed out") +class Logger: + def __init__(self) -> None: + self.logfile = os.environ.get("LOGFILE", "/dev/null") + self.logfile_handle = codecs.open(self.logfile, "wb") + self.xml = XMLGenerator(self.logfile_handle, encoding="utf-8") + self.queue: "Queue[Dict[str, str]]" = Queue() + + self.xml.startDocument() + self.xml.startElement("logfile", attrs={}) + + def close(self) -> None: + self.xml.endElement("logfile") + self.xml.endDocument() + self.logfile_handle.close() + + def sanitise(self, message: str) -> str: + return "".join(ch for ch in message if unicodedata.category(ch)[0] != "C") + + 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: str, attributes: Dict[str, str]) -> None: + self.xml.startElement("line", attributes) + self.xml.characters(message) + self.xml.endElement("line") + + 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: Dict[str, str]) -> None: + self.queue.put(message) + + 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 Empty: + pass + + @contextmanager + def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]: + eprint(self.maybe_prefix(message, attributes)) + + self.xml.startElement("nest", attrs={}) + self.xml.startElement("head", attributes) + self.xml.characters(message) + self.xml.endElement("head") + + tic = time.time() + self.drain_log_queue() + yield + self.drain_log_queue() + toc = time.time() + self.log("({:.2f} seconds)".format(toc - tic)) + + self.xml.endElement("nest") + + class Machine: def __init__(self, args: Dict[str, Any]) -> None: if "name" in args: @@ -179,11 +235,8 @@ class Machine: self.pid: Optional[int] = None self.socket = None self.monitor: Optional[socket.socket] = None + self.logger: Logger = args["log"] self.allow_reboot = args.get("allowReboot", False) - self.logger = MachineLogAdapter( - logger, - extra=dict(machine=self.name, colour_code=next(machine_colours_iter)), - ) @staticmethod def create_startcommand(args: Dict[str, str]) -> str: @@ -239,6 +292,14 @@ class Machine: def is_up(self) -> bool: return self.booted and self.connected + def log(self, msg: str) -> None: + self.logger.log(msg, {"machine": self.name}) + + 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) -> str: assert self.monitor is not None answer = "" @@ -253,7 +314,7 @@ class Machine: def send_monitor_command(self, command: str) -> str: message = ("{}\n".format(command)).encode() - self.logger.info(f"sending monitor command: {command}") + self.log("sending monitor command: {}".format(command)) assert self.monitor is not None self.monitor.send(message) return self.wait_for_monitor_prompt() @@ -320,19 +381,16 @@ class Machine: return self.execute("systemctl {}".format(q)) def require_unit_state(self, unit: str, require_state: str = "active") -> None: - self.logger.info( - f"checking if unit ‘{unit}’ has reached state '{require_state}'" - ) - info = self.get_unit_info(unit) - state = info["ActiveState"] - if state != require_state: - raise Exception( - "Expected unit ‘{}’ to to be in state ".format(unit) - + "'{}' but it is in state ‘{}’".format(require_state, state) - ) - - def log(self, message: str) -> None: - self.logger.info(message) + with self.nested( + "checking if unit ‘{}’ has reached state '{}'".format(unit, require_state) + ): + info = self.get_unit_info(unit) + state = info["ActiveState"] + if state != require_state: + raise Exception( + "Expected unit ‘{}’ to to be in state ".format(unit) + + "'{}' but it is in state ‘{}’".format(require_state, state) + ) def execute(self, command: str) -> Tuple[int, str]: self.connect() @@ -356,25 +414,27 @@ class Machine: """Execute each command and check that it succeeds.""" output = "" for command in commands: - self.logger.info(f"must succeed: {command}") - (status, out) = self.execute(command) - if status != 0: - self.logger.info(f"output: {out}") - raise Exception( - "command `{}` failed (exit code {})".format(command, status) - ) - output += out + with self.nested("must succeed: {}".format(command)): + (status, out) = self.execute(command) + if status != 0: + self.log("output: {}".format(out)) + raise Exception( + "command `{}` failed (exit code {})".format(command, status) + ) + output += out return output def fail(self, *commands: str) -> str: """Execute each command and check that it fails.""" output = "" for command in commands: - self.logger.info(f"must fail: {command}") - (status, out) = self.execute(command) - if status == 0: - raise Exception("command `{}` unexpectedly succeeded".format(command)) - output += out + with self.nested("must fail: {}".format(command)): + (status, out) = self.execute(command) + if status == 0: + raise Exception( + "command `{}` unexpectedly succeeded".format(command) + ) + output += out return output def wait_until_succeeds(self, command: str) -> str: @@ -388,9 +448,9 @@ class Machine: status, output = self.execute(command) return status == 0 - self.logger.info(f"waiting for success: {command}") - retry(check_success) - return output + with self.nested("waiting for success: {}".format(command)): + retry(check_success) + return output def wait_until_fails(self, command: str) -> str: """Wait until a command returns failure. @@ -403,21 +463,21 @@ class Machine: status, output = self.execute(command) return status != 0 - self.logger.info(f"waiting for failure: {command}") - retry(check_failure) - return output + with self.nested("waiting for failure: {}".format(command)): + retry(check_failure) + return output def wait_for_shutdown(self) -> None: if not self.booted: return - self.logger.info("waiting for the VM to power off") - sys.stdout.flush() - self.process.wait() + with self.nested("waiting for the VM to power off"): + sys.stdout.flush() + self.process.wait() - self.pid = None - self.booted = False - self.connected = False + self.pid = None + self.booted = False + self.connected = False def get_tty_text(self, tty: str) -> str: status, output = self.execute( @@ -435,19 +495,19 @@ class Machine: def tty_matches(last: bool) -> bool: text = self.get_tty_text(tty) if last: - self.logger.info( + self.log( f"Last chance to match /{regexp}/ on TTY{tty}, " f"which currently contains: {text}" ) return len(matcher.findall(text)) > 0 - self.logger.info(f"waiting for {regexp} to appear on tty {tty}") - retry(tty_matches) + with self.nested("waiting for {} to appear on tty {}".format(regexp, tty)): + retry(tty_matches) def send_chars(self, chars: List[str]) -> None: - self.logger.info(f"sending keys ‘{chars}‘") - for char in chars: - self.send_key(char) + with self.nested("sending keys ‘{}‘".format(chars)): + for char in chars: + self.send_key(char) def wait_for_file(self, filename: str) -> None: """Waits until the file exists in machine's file system.""" @@ -456,16 +516,16 @@ class Machine: status, _ = self.execute("test -e {}".format(filename)) return status == 0 - self.logger.info(f"waiting for file ‘{filename}‘") - retry(check_file) + with self.nested("waiting for file ‘{}‘".format(filename)): + retry(check_file) 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 - self.logger.info(f"waiting for TCP port {port}") - retry(port_is_open) + with self.nested("waiting for TCP port {}".format(port)): + retry(port_is_open) def wait_for_closed_port(self, port: int) -> None: def port_is_closed(_: Any) -> bool: @@ -487,17 +547,17 @@ class Machine: if self.connected: return - self.logger.info("waiting for the VM to finish booting") - self.start() + with self.nested("waiting for the VM to finish booting"): + self.start() - tic = time.time() - self.shell.recv(1024) - # TODO: Timeout - toc = time.time() + tic = time.time() + self.shell.recv(1024) + # TODO: Timeout + toc = time.time() - self.logger.info("connected to guest root shell") - self.logger.info(f"(connecting took {toc - tic:.2f} seconds)") - self.connected = True + self.log("connected to guest root shell") + self.log("(connecting took {:.2f} seconds)".format(toc - tic)) + self.connected = True def screenshot(self, filename: str) -> None: out_dir = os.environ.get("out", os.getcwd()) @@ -506,12 +566,15 @@ class Machine: filename = os.path.join(out_dir, "{}.png".format(filename)) tmp = "{}.ppm".format(filename) - self.logger.info(f"making screenshot {filename}") - self.send_monitor_command("screendump {}".format(tmp)) - ret = subprocess.run("pnmtopng {} > {}".format(tmp, filename), shell=True) - os.unlink(tmp) - if ret.returncode != 0: - raise Exception("Cannot convert screenshot") + with self.nested( + "making screenshot {}".format(filename), + {"image": os.path.basename(filename)}, + ): + self.send_monitor_command("screendump {}".format(tmp)) + ret = subprocess.run("pnmtopng {} > {}".format(tmp, filename), shell=True) + os.unlink(tmp) + if ret.returncode != 0: + raise Exception("Cannot convert screenshot") def copy_from_host_via_shell(self, source: str, target: str) -> None: """Copy a file from the host into the guest by piping it over the @@ -587,18 +650,20 @@ class Machine: tess_args = "-c debug_file=/dev/null --psm 11 --oem 2" - self.logger.info("performing optical character recognition") - with tempfile.NamedTemporaryFile() as tmpin: - self.send_monitor_command("screendump {}".format(tmpin.name)) + with self.nested("performing optical character recognition"): + with tempfile.NamedTemporaryFile() as tmpin: + self.send_monitor_command("screendump {}".format(tmpin.name)) - cmd = "convert {} {} tiff:- | tesseract - - {}".format( - magick_args, tmpin.name, tess_args - ) - ret = subprocess.run(cmd, shell=True, capture_output=True) - if ret.returncode != 0: - raise Exception("OCR failed with exit code {}".format(ret.returncode)) + cmd = "convert {} {} tiff:- | tesseract - - {}".format( + magick_args, tmpin.name, tess_args + ) + ret = subprocess.run(cmd, shell=True, capture_output=True) + if ret.returncode != 0: + raise Exception( + "OCR failed with exit code {}".format(ret.returncode) + ) - return ret.stdout.decode("utf-8") + return ret.stdout.decode("utf-8") def wait_for_text(self, regex: str) -> None: def screen_matches(last: bool) -> bool: @@ -606,15 +671,15 @@ class Machine: matches = re.search(regex, text) is not None if last and not matches: - self.logger.info(f"Last OCR attempt failed. Text was: {text}") + self.log("Last OCR attempt failed. Text was: {}".format(text)) return matches - self.logger.info(f"waiting for {regex} to appear on screen") - retry(screen_matches) + with self.nested("waiting for {} to appear on screen".format(regex)): + retry(screen_matches) def wait_for_console_text(self, regex: str) -> None: - self.logger.info(f"waiting for {regex} to appear on console") + self.log("waiting for {} to appear on console".format(regex)) # Buffer the console output, this is needed # to match multiline regexes. console = io.StringIO() @@ -637,7 +702,7 @@ class Machine: if self.booted: return - self.logger.info("starting vm") + self.log("starting vm") def create_socket(path: str) -> socket.socket: if os.path.exists(path): @@ -694,7 +759,7 @@ class Machine: # Store last serial console lines for use # of wait_for_console_text - self.last_lines: queue.Queue = queue.Queue() + self.last_lines: Queue = Queue() def process_serial_output() -> None: assert self.process.stdout is not None @@ -702,7 +767,8 @@ class Machine: # Ignore undecodable bytes that may occur in boot menus line = _line.decode(errors="ignore").replace("\r", "").rstrip() self.last_lines.put(line) - self.logger.info(line) + eprint("{} # {}".format(self.name, line)) + self.logger.enqueue({"msg": line, "machine": self.name}) _thread.start_new_thread(process_serial_output, ()) @@ -711,10 +777,10 @@ class Machine: self.pid = self.process.pid self.booted = True - self.logger.info(f"QEMU running (pid {self.pid})") + self.log("QEMU running (pid {})".format(self.pid)) def cleanup_statedir(self) -> None: - self.logger.info("delete the VM state directory") + self.log("delete the VM state directory") if os.path.isfile(self.state_dir): shutil.rmtree(self.state_dir) @@ -729,7 +795,7 @@ class Machine: if not self.booted: return - self.logger.info("forced crash") + self.log("forced crash") self.send_monitor_command("quit") self.wait_for_shutdown() @@ -749,8 +815,8 @@ class Machine: status, _ = self.execute("[ -e /tmp/.X11-unix/X0 ]") return status == 0 - self.logger.info("waiting for the X11 server") - retry(check_x) + with self.nested("waiting for the X11 server"): + retry(check_x) def get_window_names(self) -> List[str]: return self.succeed( @@ -763,14 +829,15 @@ class Machine: def window_is_visible(last_try: bool) -> bool: names = self.get_window_names() if last_try: - self.logger.info( - f"Last chance to match {regexp} on the window list, " - + f"which currently contains: {', '.join(names)}" + self.log( + "Last chance to match {} on the window list,".format(regexp) + + " which currently contains: " + + ", ".join(names) ) return any(pattern.search(name) for name in names) - self.logger.info("Waiting for a window to appear") - retry(window_is_visible) + with self.nested("Waiting for a window to appear"): + retry(window_is_visible) def sleep(self, secs: int) -> None: # We want to sleep in *guest* time, not *host* time. @@ -799,22 +866,23 @@ class Machine: 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() -> None: global machines - logger.info("starting all VMs") - for machine in machines: - machine.start() + with log.nested("starting all VMs"): + for machine in machines: + machine.start() def join_all() -> None: global machines - logger.info("waiting for all VMs to finish") - for machine in machines: - machine.wait_for_shutdown() + with log.nested("waiting for all VMs to finish"): + for machine in machines: + machine.wait_for_shutdown() def test_script() -> None: @@ -825,12 +893,13 @@ def run_tests() -> None: global machines tests = os.environ.get("tests", None) if tests is not None: - logger.info("running the VM test script") - try: - exec(tests, globals()) - except Exception: - logging.exception("error:") - sys.exit(1) + with log.nested("running the VM test script"): + try: + exec(tests, globals()) + except Exception as e: + eprint("error: ") + traceback.print_exc() + sys.exit(1) else: ptpython.repl.embed(locals(), globals()) @@ -843,19 +912,18 @@ def run_tests() -> None: @contextmanager def subtest(name: str) -> Iterator[None]: - logger.info(name) - try: - yield - return True - except Exception as e: - logger.info(f'Test "{name}" failed with error: "{e}"') - raise e + with log.nested(name): + try: + yield + return True + except Exception as e: + log.log(f'Test "{name}" failed with error: "{e}"') + raise e return False -def main() -> None: - global machines +if __name__ == "__main__": arg_parser = argparse.ArgumentParser() arg_parser.add_argument( "-K", @@ -865,6 +933,8 @@ def main() -> None: ) (cli_args, vm_scripts) = arg_parser.parse_known_args() + log = Logger() + vlan_nrs = list(dict.fromkeys(os.environ.get("VLANS", "").split())) vde_sockets = [create_vlan(v) for v in vlan_nrs] for nr, vde_socket, _, _ in vde_sockets: @@ -875,27 +945,23 @@ def main() -> None: if not cli_args.keep_vm_state: machine.cleanup_statedir() machine_eval = [ - "global {0}; {0} = machines[{1}]".format(m.name, idx) - for idx, m in enumerate(machines) + "{0} = machines[{1}]".format(m.name, idx) for idx, m in enumerate(machines) ] exec("\n".join(machine_eval)) @atexit.register def clean_up() -> None: - logger.info("cleaning up") - for machine in machines: - if machine.pid is None: - continue - logger.info(f"killing {machine.name} (pid {machine.pid})") - machine.process.kill() - for _, _, process, _ in vde_sockets: - process.terminate() + with log.nested("cleaning up"): + for machine in machines: + if machine.pid is None: + continue + log.log("killing {} (pid {})".format(machine.name, machine.pid)) + machine.process.kill() + for _, _, process, _ in vde_sockets: + process.terminate() + log.close() tic = time.time() run_tests() toc = time.time() print("test script finished in {:.2f}s".format(toc - tic)) - - -if __name__ == "__main__": - main() diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 4812567b8c6..c6939c7d698 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -62,7 +62,7 @@ rec { '' mkdir -p $out - tests='exec(os.environ["testScript"])' ${driver}/bin/nixos-test-driver + LOGFILE=/dev/null tests='exec(os.environ["testScript"])' ${driver}/bin/nixos-test-driver for i in */xchg/coverage-data; do mkdir -p $out/coverage-data diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 437199bae1d..ed9c2509b6b 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -288,7 +288,10 @@ fi if [ "$action" = edit ]; then if [[ -z $flake ]]; then NIXOS_CONFIG=${NIXOS_CONFIG:-$(nix-instantiate --find-file nixos-config)} - exec "${EDITOR:-nano}" "$NIXOS_CONFIG" + if [[ -d $NIXOS_CONFIG ]]; then + NIXOS_CONFIG=$NIXOS_CONFIG/default.nix + fi + exec ${EDITOR:-nano} "$NIXOS_CONFIG" else exec nix edit "${lockFlags[@]}" -- "$flake#$flakeAttr" fi diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c837976286b..03127cf9adf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -297,7 +297,6 @@ ./services/desktops/accountsservice.nix ./services/desktops/bamf.nix ./services/desktops/blueman.nix - ./services/desktops/deepin/deepin.nix ./services/desktops/dleyna-renderer.nix ./services/desktops/dleyna-server.nix ./services/desktops/pantheon/files.nix @@ -719,6 +718,7 @@ ./services/networking/rdnssd.nix ./services/networking/redsocks.nix ./services/networking/resilio.nix + ./services/networking/robustirc-bridge.nix ./services/networking/rpcbind.nix ./services/networking/rxe.nix ./services/networking/sabnzbd.nix diff --git a/nixos/modules/services/desktops/deepin/deepin.nix b/nixos/modules/services/desktops/deepin/deepin.nix deleted file mode 100644 index f8fb73701af..00000000000 --- a/nixos/modules/services/desktops/deepin/deepin.nix +++ /dev/null @@ -1,123 +0,0 @@ -# deepin - -{ config, pkgs, lib, ... }: - -{ - - ###### interface - - options = { - - services.deepin.core.enable = lib.mkEnableOption " - Basic dbus and systemd services, groups and users needed by the - Deepin Desktop Environment. - "; - - services.deepin.deepin-menu.enable = lib.mkEnableOption " - DBus service for unified menus in Deepin Desktop Environment. - "; - - services.deepin.deepin-turbo.enable = lib.mkEnableOption " - Turbo service for the Deepin Desktop Environment. It is a daemon - that helps to launch applications faster. - "; - - }; - - - ###### implementation - - config = lib.mkMerge [ - - (lib.mkIf config.services.deepin.core.enable { - environment.systemPackages = [ - pkgs.deepin.dde-api - pkgs.deepin.dde-calendar - pkgs.deepin.dde-control-center - pkgs.deepin.dde-daemon - pkgs.deepin.dde-dock - pkgs.deepin.dde-launcher - pkgs.deepin.dde-file-manager - pkgs.deepin.dde-session-ui - pkgs.deepin.deepin-anything - pkgs.deepin.deepin-image-viewer - ]; - - services.dbus.packages = [ - pkgs.deepin.dde-api - pkgs.deepin.dde-calendar - pkgs.deepin.dde-control-center - pkgs.deepin.dde-daemon - pkgs.deepin.dde-dock - pkgs.deepin.dde-launcher - pkgs.deepin.dde-file-manager - pkgs.deepin.dde-session-ui - pkgs.deepin.deepin-anything - pkgs.deepin.deepin-image-viewer - ]; - - systemd.packages = [ - pkgs.deepin.dde-api - pkgs.deepin.dde-daemon - pkgs.deepin.dde-file-manager - pkgs.deepin.deepin-anything - ]; - - boot.extraModulePackages = [ config.boot.kernelPackages.deepin-anything ]; - - boot.kernelModules = [ "vfs_monitor" ]; - - users.groups.deepin-sound-player = { }; - - users.users.deepin-sound-player = { - description = "Deepin sound player"; - group = "deepin-sound-player"; - isSystemUser = true; - }; - - users.groups.deepin-daemon = { }; - - users.users.deepin-daemon = { - description = "Deepin daemon user"; - group = "deepin-daemon"; - isSystemUser = true; - }; - - users.groups.deepin_anything_server = { }; - - users.users.deepin_anything_server = { - description = "Deepin Anything Server"; - group = "deepin_anything_server"; - isSystemUser = true; - }; - - security.pam.services.deepin-auth-keyboard.text = '' - # original at ${pkgs.deepin.dde-daemon}/etc/pam.d/deepin-auth-keyboard - auth [success=2 default=ignore] pam_lsass.so - auth [success=1 default=ignore] pam_unix.so nullok_secure try_first_pass - auth requisite pam_deny.so - auth required pam_permit.so - ''; - - environment.etc = { - "polkit-1/localauthority/10-vendor.d/com.deepin.api.device.pkla".source = "${pkgs.deepin.dde-api}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.api.device.pkla"; - "polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla".source = "${pkgs.deepin.dde-daemon}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla"; - "polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla".source = "${pkgs.deepin.dde-daemon}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla"; - }; - - services.deepin.deepin-menu.enable = true; - services.deepin.deepin-turbo.enable = true; - }) - - (lib.mkIf config.services.deepin.deepin-menu.enable { - services.dbus.packages = [ pkgs.deepin.deepin-menu ]; - }) - - (lib.mkIf config.services.deepin.deepin-turbo.enable { - environment.systemPackages = [ pkgs.deepin.deepin-turbo ]; - systemd.packages = [ pkgs.deepin.deepin-turbo ]; - }) - - ]; - -} diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 924a007efc6..0fbc9cecb4d 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -500,13 +500,6 @@ in config = { - assertions = [ - { - assertion = config.nix.distributedBuilds || config.nix.buildMachines == []; - message = "You must set `nix.distributedBuilds = true` to use nix.buildMachines"; - } - ]; - nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; nix.binaryCaches = [ "https://cache.nixos.org/" ]; diff --git a/nixos/modules/services/networking/robustirc-bridge.nix b/nixos/modules/services/networking/robustirc-bridge.nix new file mode 100644 index 00000000000..255af79ec04 --- /dev/null +++ b/nixos/modules/services/networking/robustirc-bridge.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.robustirc-bridge; +in +{ + options = { + services.robustirc-bridge = { + enable = mkEnableOption "RobustIRC bridge"; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = ''Extra flags passed to the robustirc-bridge command. See RobustIRC Documentation or robustirc-bridge(1) for details.''; + example = [ + "-network robustirc.net" + ]; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.robustirc-bridge = { + description = "RobustIRC bridge"; + documentation = [ + "man:robustirc-bridge(1)" + "https://robustirc.net/" + ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + DynamicUser = true; + ExecStart = "${pkgs.robustirc-bridge}/bin/robustirc-bridge ${concatStringsSep " " cfg.extraFlags}"; + Restart = "on-failure"; + + # Hardening + PrivateDevices = true; + ProtectSystem = true; + ProtectHome = true; + PrivateTmp = true; + }; + }; + }; +} diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index b33e905c67d..b4bc2f694e4 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -34,8 +34,8 @@ let User tor DataDirectory ${torDirectory} ${optionalString cfg.enableGeoIP '' - GeoIPFile ${pkgs.tor.geoip}/share/tor/geoip - GeoIPv6File ${pkgs.tor.geoip}/share/tor/geoip6 + GeoIPFile ${cfg.package.geoip}/share/tor/geoip + GeoIPv6File ${cfg.package.geoip}/share/tor/geoip6 ''} ${optint "ControlPort" cfg.controlPort} @@ -123,6 +123,16 @@ in ''; }; + package = mkOption { + type = types.package; + default = pkgs.tor; + defaultText = "pkgs.tor"; + example = literalExample "pkgs.tor"; + description = '' + Tor package to use + ''; + }; + enableGeoIP = mkOption { type = types.bool; default = true; @@ -749,8 +759,8 @@ in serviceConfig = { Type = "simple"; # Translated from the upstream contrib/dist/tor.service.in - ExecStartPre = "${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config"; - ExecStart = "${pkgs.tor}/bin/tor -f ${torRcFile}"; + ExecStartPre = "${cfg.package}/bin/tor -f ${torRcFile} --verify-config"; + ExecStart = "${cfg.package}/bin/tor -f ${torRcFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; KillSignal = "SIGINT"; TimeoutSec = 30; @@ -773,7 +783,7 @@ in }; }; - environment.systemPackages = [ pkgs.tor ]; + environment.systemPackages = [ cfg.package ]; services.privoxy = mkIf (cfg.client.enable && cfg.client.privoxy.enable) { enable = true; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 7223d95774e..945ba90e345 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -121,7 +121,8 @@ in rec { (onFullSupported "nixos.tests.networking.networkd.dhcpSimple") (onFullSupported "nixos.tests.networking.networkd.link") (onFullSupported "nixos.tests.networking.networkd.loopback") - (onFullSupported "nixos.tests.networking.networkd.macvlan") + # Fails nondeterministically (https://github.com/NixOS/nixpkgs/issues/96709) + #(onFullSupported "nixos.tests.networking.networkd.macvlan") (onFullSupported "nixos.tests.networking.networkd.privacy") (onFullSupported "nixos.tests.networking.networkd.routes") (onFullSupported "nixos.tests.networking.networkd.sit") diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index fabd525dd90..60ef5a02763 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -298,6 +298,7 @@ in redis = handleTest ./redis.nix {}; redmine = handleTest ./redmine.nix {}; restic = handleTest ./restic.nix {}; + robustirc-bridge = handleTest ./robustirc-bridge.nix {}; roundcube = handleTest ./roundcube.nix {}; rspamd = handleTest ./rspamd.nix {}; rss2email = handleTest ./rss2email.nix {}; diff --git a/nixos/tests/common/acme/server/mkcerts.nix b/nixos/tests/common/acme/server/mkcerts.nix index 2474019cbac..c9616bf9672 100644 --- a/nixos/tests/common/acme/server/mkcerts.nix +++ b/nixos/tests/common/acme/server/mkcerts.nix @@ -59,7 +59,8 @@ pkgs.runCommand "acme-snakeoil-ca" { openssl genrsa -out snakeoil.key 4096 openssl req -new -key snakeoil.key -out snakeoil.csr openssl x509 -req -in snakeoil.csr -sha256 -set_serial 666 \ - -CA ca.pem -CAkey ca.key -out snakeoil.pem -days 36500 + -CA ca.pem -CAkey ca.key -out snakeoil.pem -days 36500 \ + -extfile "$OPENSSL_CONF" -extensions req_ext addpem snakeoil.key ${lib.escapeShellArg fqdn} key addpem snakeoil.pem ${lib.escapeShellArg fqdn} cert '') domains} diff --git a/nixos/tests/common/acme/server/snakeoil-certs.nix b/nixos/tests/common/acme/server/snakeoil-certs.nix index fd537c3260f..7325b027c7e 100644 --- a/nixos/tests/common/acme/server/snakeoil-certs.nix +++ b/nixos/tests/common/acme/server/snakeoil-certs.nix @@ -2,170 +2,171 @@ { ca.key = builtins.toFile "ca.key" '' -----BEGIN PRIVATE KEY----- - MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDCnVZGEn68ezXl - DWE5gjsCPqutR4nxw/wvIbAxB2Vk2WeQ6HGvt2Jdrz5qer2IXd76YtpQeqd+ffet - aLtMeFTr+Xy9yqEpx2AfvmEEcLnuiWbsUGZzsHwW7/4kPgAFBy9TwJn/k892lR6u - QYa0QS39CX85kLMZ/LZXUyClIBa+IxT1OovmGqMOr4nGASRQP6d/nnyn41Knat/d - tpyaa5zgfYwA6YW6UxcywvBSpMOXM0/82BFZGyALt3nQ+ffmrtKcvMjsNLBFaslV - +zYO1PMbLbTCW8SmJTjhzuapXtBHruvoe24133XWlvcP1ylaTx0alwiQWJr1XEOU - WLEFTgOTeRyiVDxDunpz+7oGcwzcdOG8nCgd6w0aYaECz1zvS3FYTQz+MiqmEkx6 - s4bj1U90I0kwUJbeWjjrGO7Y9Qq4i19GafDg7cAMn9eHCiNbNrPj6t/gfaVbCrbk - m3ZVjkvLTQ2mb2lv7+tVii45227iNPuNS6lx2FVlr/DXiRrOVfghPvoOxUfXzogJ - hZLV4Zki+ycbGQa5w8YMDYCv4c08dKA7AatVhNS60c1zgQNjuWF3BvocSySyGUon - VT6h1DYlJ9YAqgqNpedgNR9kpp034SMhB7dj9leB6LRMA+c1fG/T+1lDbkA+vope - pt4+30oDcCTYfEifl1HwqNw/bXDm1wIDAQABAoICABPbd/UYaAQVUk93yQbUKe81 - s9CvbvzTMYUhm9e02Hyszitz/D2gqZHDksvMkFA8u8aylXIGwdZfRglUmV/ZG1kk - kLzQ0xbvN/ilNUL9uYsETBMqtPly9YZloHnUNa5NqF+UVGJGk7GWz5WaLANybx3V - fTzDbfLl3TkVy0vt9UQbUkUfXyzwZNjXwmgIr8rcY9vasP90a3eXqRX3Tw1Wk6A4 - TzO8oB994O0WBO150Fc6Lhwvc72yzddENlLDXq8UAXtqq9mmGqJKnhZ+1mo3AkMw - q7P1JyCIxcAMm26GtRvLVljXV0x5640kxDrCin6jeeW/qWkJEW6dpmuZjR5scmLI - /9n8H+fGzdZH8bOPPotMy12doj3vJqvew3p0eIkmVctYMJKD0j/CWjvKJNE3Yx4O - Ls47X/dEypX6anR1HQUXcpd6JfRWdIJANo2Duaz+HYbyA88bHcJL9shFYcjLs3sX - R/TvnnKHvw/ud7XBgvLGwGAf/cDEuLI2tv+V7tkMGrMUv+gUJNZaJaCpdt+1iUwO - QFq8APyBNn6FFw54TwXWfSjfSNh3geIMLHuErYVu9MIXvB7Yhh+ZvLcfLbmckhAX - wb39RRHnCWvnw5Bm9hnsDhqfDsIoP+2wvUkViyHOmrKi8nSJhSk19C8AuQtSVcJg - 5op+epEmjt70GHt52nuBAoIBAQD2a4Ftp4QxWE2d6oAFI6WPrX7nAwI5/ezCbO/h - yoYAn6ucTVnn5/5ITJ8V4WTWZ4lkoZP3YSJiCyBhs8fN63J+RaJ/bFRblHDns1HA - 2nlMVdNLg6uOfjgUJ8Y6xVM0J2dcFtwIFyK5pfZ7loxMZfvuovg74vDOi2vnO3dO - 16DP3zUx6B/yIt57CYn8NWTq+MO2bzKUnczUQRx0yEzPOfOmVbcqGP8f7WEdDWXm - 7scjjN53OPyKzLOVEhOMsUhIMBMO25I9ZpcVkyj3/nj+fFLf/XjOTM00M/S/KnOj - RwaWffx6mSYS66qNc5JSsojhIiYyiGVEWIznBpNWDU35y/uXAoIBAQDKLj0dyig2 - kj1r3HvdgK4sRULqBQFMqE9ylxDmpJxAj6/A8hJ0RCBR57vnIIZMzK4+6K0l3VBJ - ukzXJHJLPkZ0Uuo2zLuRLkyjBECH6KYznyTkUVRn50Oq6IoP6WTCfd3Eg+7AKYY1 - VFo2iR8sxeSQQ+AylFy6QcQ1xPIW30Jj1/LFjrRdRggapPEekpJec0pEqhasT8rR - UFhRL2NdZnL5b7ZlsJc7gZKEJgNfxgzaCzloqLcjCgGpOhLKx0fFsNOqHcbIGMwG - 6wQCOyNghQJ6AZtRD5TYCJow92FchWjoTIaMJ8RjMKQmxpiwM6wQG4J78Hd3mbhf - q0hiQhPHaNbBAoIBAFeIeMFq8BpXM7sUwcURlI4lIx8Mgo33FVM7PzsFpfQyw9MR - 5w3p6vnjvd8X4aoHvVZxzw3hA0WwjiAmrKMJL/KK6d45rP2bDUBBAplvAgeLtTLt - 4tMLIwCF4HSgA55TIPQlaqO1FDC+M4BTSiMZVxS970/WnZPBEuNgzFDFZ+pvb4X6 - 3t40ZLNwAAQHM4IEPAFiHqWMKGZ9eo5BWIeEHnjHmfjqSDYfLJAVYk1WJIcMUzom - lA76CBC8CxW/I94AtcRhWuFUv/Z5/+OYEYLUxtuqPm+J+JrCmf4OJmWppT1wI2+p - V00BSeRVWXTm1piieM8ahF5y1hp6y3uV3k0NmKECggEBAMC42Ms3s6NpPSE+99eJ - 3P0YPJOkl7uByNGbTKH+kW89SDRsy8iGVCSe9892gm5cwU/4LWyljO3qp2qBNG2i - /DfP/bCk8bqPXsAZwoWK8DrO3bTCDepJWYhlx40pVkHLBwVXGdOVAXh+YswPY2cj - cB9QhDrSj52AKU9z36yLvtY7uBA3Wph6tCjpx2n0H4/m6AmR9LDmEpf5tWYV/OrA - SKKaqUw/y7kOZyKOtbKqr/98qYmpIYFF/ZVZZSZkVXcNeoZzgdOlR37ksVqLEsrj - nxu7wli/uItBj/FTLjyqcvjUUYDyO1KtwBuyPUPgzYhBIN2Rt9+K6WRQelwnToFL - 30ECggEBALzozykZj2sr3z8tQQRZuXLGotUFGsQCB8ikeqoeB8FbNNkC+qgflQGv - zLRB2KWOvnboc94wVgBJH43xG0HBibZnBhUO8/HBI/WlmyEj9KQ/ZskUK4GVZkB6 - r/81ASLwH+P/rqrLEjcp1SIPPevjzCWD9VYR5m/qPHLNxStwGSrPjtPzgaFxhq84 - Jl+YVmNqVlrOKYYfIPh8exPLiTti3wfM61pVYFv56PI2gd5ysMWYnuN+vK0sbmZh - cIWwykcKlODIngI7IzYqt8NuIJI0jrYyHgtUw4jaJzdF4mEOplGONxdz15jAGHtg - JUsBXFNz132nP4iIr3UKrPedQZijSi4= + MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQDd1G7OFpXIoHnr + rxdw+hiJVDY6nQDDKFt9FBKwlv7x2hCvX7bnyvHaL7H61c+80McGPISrQn3+MjuR + Zuqwax49DddNXbGt4WqGlx4LAeI37OgNUUz9foNr2rDDV744vwp14/PD1f3nqpWf + Ogzzsh8rxac0mZ5Se9HxOIpI7NRNuHJjj7HWZ4YxeOvi289rmpu0JPcp25njw7h6 + FNfHu8GGp34Uj6wAxubdRyfViV8z9FMfbglLuA9i1OiSy3NQpq8VwBG+u/0iC7PQ + sQjxSragQu25sfATYIrFJQ4ZCvh0nxqKMeyPPBi6dAcMpa2AZAqtqv+CwWdo36Bt + S5XiC7rApgYn+yteKQHSbnCiG2W/boSbfg9lRk3w41dESENCADVajLb3Eovvp0tB + O/BALudvWjzAPbpXleVNr6ngWtGlsZTC7LXDgBqdW2KlzpZGcz+PW3ATlwip/ZFR + t7A15u5dVkWPVoPuQ0w1Tw+g9dxWFTNk3h+2d7K87IxQbcvqxeIDSEVFMrxo0e4C + G2udMcelZwARl6iNTAETa2zJW0XtAdGVM+HY1S/kU6U9J3nubDttAkAMABjPwyjL + G7hfyWqUHf9yPs49GsftAVvIy8XIeu0shD1BG11/VzvwpUCiRc+btuWi2erZ4ZfP + oQ5YoS9gt4S+Ipz7TPGBl+AUk9HO2QIDAQABAoICAGW+aLAXxc2GZUVHQp4r55Md + T94kYtQgL4435bafGwH8vchiQzcfazxiweRFqwl0TMS8fzE5xyYPDilLpfsStoTU + U1sFzVfuWviuWTY9P+/ctjZdgs2F+GtAm/CMzw+h9/9IdWbuQI3APO4SJxyjJw7h + kiZbCzXT2uAjybFXBq07GyQ1JSEszGzmhHLB1OoKuL2wcrj9IyFHhNZhtvLCWCoV + qotttjuI/xyg5VFYt5TRzEpPIu5a1pvDAYVK0XI9cXKtbLYp7RlveqMOgAaD+S2a + ZQTV60JH9n4j18p+sKR00SxvZ4vuyXzDePRBDUolGIy9MIJdiLueTiuzDmTmclnM + 8Yy7oliawW2Bn+1gaWpqmgzEUw9bXRSqIp2zGZ7HaQ+5c/MhS002+/i8WQyssfeg + 9EfI+Vl0D2avTxCECmsfjUxtkhzMYPVNbRPjt0QBEM+s8lDoNsP2zhMO441+TKpe + /5KZHIW+Y0US6GMIUs1o1byKfNz8Nj5HjEKO9CMyK6SBMJnCMroPD4H6opqk3lw9 + 4mk04BdN556EzyJDT0a5/VpXG2DUYwFaNwE1ZPMu3Yx6IBoM1xx8mR80vHQCddmF + NP+BzkpUiHf0Txyy0YQWECZ/anTt0Bo0XqY5tirIM2dkG0ngNl9tGlw6gVAY1ky8 + +cr7qKmhhwMWojaX/L+9AoIBAQD/BZAeF3l9I5RBh6ktWA+opzVyd6ejdLpc2Q1z + fmSmtUKRsEe51sWaIf6Sez408UaCMT2IQuppPgMnV8xfMM1/og75Cs8aPyAohwKo + IbOenXhLfFZiYB4y/Pac3F+FzNKsTT6n+fsE+82UHafY5ZI2FlPb2L0lfyx09zXv + fBYhcXgwSx5ymJLJSl8zFaEGn9qi3UB5ss44SaNM0n8SFGUQUk3PR7SFWSWgNxtl + CP7LWTsjXYoC/qBMe7b8JieK5aFk1EkkG1EkJvdiMnulMcMJzl+kj6LqVPmVDoZS + mMGvgKGJPpFgrbJ5wlA7uOhucGmMpFWP9RCav66DY4GHrLJPAoIBAQDerkZQ03AN + i2iJVjtL97TvDjrE8vtNFS/Auh8JyDIW4GGK3Y/ZoMedQpuu3e6NYM9aMjh+QJoA + kqhaiZ/tMXjEXJByglpc3a43g2ceWtJg5yLgexGgRtegbA57PRCo35Vhc6WycD1l + 6FZNxpTkd2BXX/69KWZ6PpSiLYPvdzxP5ZkYqoWRQIa4ee4orHfz/lUXJm1XwmyG + mx3hN9Z9m8Q/PGMGfwrorcp4DK53lmmhTZyPh+X5T5/KkVmrw/v5HEEB3JsknStR + 3DAqp2XZcRHsGQef9R7H+PINJm9nebjCraataaE4gr76znXKT23P80Ce5Lw6OQUW + XHhoL16gS+pXAoIBADTuz6ofTz01PFmZsfjSdXWZN1PKGEaqPOB2wP7+9h9QMkAR + KeId/Sfv9GotII1Woz70v4Pf983ebEMnSyla9NyQI7F3l+MnxSIEW/3P+PtsTgLF + DR0gPERzEzEd4Mnh6LyQz/eHwJ2ZMmOTADrZ8848Ni3EwAXfbrfcdBqAVAufBMZp + YSmCF72mLTpqO+EnHvd9GxvnjDxMtJOGgY+cIhoQK0xh4stm5JNrvMjs5A4LOGYv + zSyv80/Mwf92X/DJlwVZttDCxsXNPL3qIpX4TTZk2p9KnRMsjh1tRV4xjMpD1cOp + 8/zwMMJrHcI3sC70MERb+9KEmGy2ap+k8MbbhqsCggEAUAqqocDupR+4Kq2BUPQv + 6EHgJA0HAZUc/hSotXZtcsWiqiyr2Vkuhzt7BGcnqU/kGJK2tcL42D3fH/QaNUM0 + Grj+/voWCw1v4uprtYCF4GkUo0X5dvgf570Pk4LGqzz6z/Wm2LX5i9jwtLItsNWs + HpwVz97CxCwcdxMPOpNMbZek6TXaHvTnuAWz8pDT6TNBWLnqUcJECjpVii/s/Gdy + KhzFp38g57QYdABy8e9x9pYUMY9yvaO+VyzZ46DlwIxEXavzZDzOZnVUJvDW7krz + Wz8/+2I7dzvnnYx0POiG3gtXPzwZxFtS1IpD0r2sRjQ0xSiI9BCs4HXKngBw7gN7 + rwKCAQEAloJOFw4bafVXZVXuQVnLDm0/MNTfqxUzFE6V2WkMVkJqcpKt+ndApM8P + MJvojHWw1fmxDzIAwqZ9rXgnwWKydjSZBDYNjhGFUACVywHe5AjC4PPMUdltGptU + lY0BjC7qtwkVugr65goQkEzU61y9JgTqKpYsr3D+qXcoiDvWRuqk5Q0WfYJrUlE0 + APWaqbxmkqUVDRrXXrifiluupk+BCV7cFSnnknSYbd9FZd9DuKaoNBlkp2J9LZE+ + Ux74Cfro8SHINHmvqL+YLFUPVDWNeuXh5Kl6AaJ7yclCLXLxAIix3/rIf6mJeIGc + s9o9Sr49cibZ3CbMjCSNE3AOeVE1/Q== -----END PRIVATE KEY----- ''; ca.cert = builtins.toFile "ca.cert" '' -----BEGIN CERTIFICATE----- - MIIFDzCCAvegAwIBAgIUTRDYSWJvmlhwIR3pzVrIQfnboLEwDQYJKoZIhvcNAQEL - BQAwFjEUMBIGA1UEAwwLU25ha2VvaWwgQ0EwIBcNMjAwMzIyMjI1NjE3WhgPMjEy - MDAyMjcyMjU2MTdaMBYxFDASBgNVBAMMC1NuYWtlb2lsIENBMIICIjANBgkqhkiG - 9w0BAQEFAAOCAg8AMIICCgKCAgEAwp1WRhJ+vHs15Q1hOYI7Aj6rrUeJ8cP8LyGw - MQdlZNlnkOhxr7diXa8+anq9iF3e+mLaUHqnfn33rWi7THhU6/l8vcqhKcdgH75h - BHC57olm7FBmc7B8Fu/+JD4ABQcvU8CZ/5PPdpUerkGGtEEt/Ql/OZCzGfy2V1Mg - pSAWviMU9TqL5hqjDq+JxgEkUD+nf558p+NSp2rf3bacmmuc4H2MAOmFulMXMsLw - UqTDlzNP/NgRWRsgC7d50Pn35q7SnLzI7DSwRWrJVfs2DtTzGy20wlvEpiU44c7m - qV7QR67r6HtuNd911pb3D9cpWk8dGpcIkFia9VxDlFixBU4Dk3kcolQ8Q7p6c/u6 - BnMM3HThvJwoHesNGmGhAs9c70txWE0M/jIqphJMerOG49VPdCNJMFCW3lo46xju - 2PUKuItfRmnw4O3ADJ/XhwojWzaz4+rf4H2lWwq25Jt2VY5Ly00Npm9pb+/rVYou - Odtu4jT7jUupcdhVZa/w14kazlX4IT76DsVH186ICYWS1eGZIvsnGxkGucPGDA2A - r+HNPHSgOwGrVYTUutHNc4EDY7lhdwb6HEskshlKJ1U+odQ2JSfWAKoKjaXnYDUf - ZKadN+EjIQe3Y/ZXgei0TAPnNXxv0/tZQ25APr6KXqbePt9KA3Ak2HxIn5dR8Kjc - P21w5tcCAwEAAaNTMFEwHQYDVR0OBBYEFCIoeYSYjtMiPrmxfHmcrsZkyTpvMB8G - A1UdIwQYMBaAFCIoeYSYjtMiPrmxfHmcrsZkyTpvMA8GA1UdEwEB/wQFMAMBAf8w - DQYJKoZIhvcNAQELBQADggIBAHPdwOgAxyhIhbqFObNftW8K3sptorB/Fj6jwYCm - mHleFueqQnjTHMWsflOjREvQp1M307FWooGj+KQkjwvAyDc/Hmy7WgJxBg9p3vc+ - /Xf/e7ZfBl8rv7vH8VXW/BC1vVsILdFncrgTrP8/4psV50/cl1F4+nPBiekvvxwZ - k+R7SgeSvcWT7YlOG8tm1M3al4F4mWzSRkYjkrXmwRCKAiya9xcGSt0Bob+LoM/O - mpDGV/PMC1WAoDc1mMuXN2hSc0n68xMcuFs+dj/nQYn8uL5pzOxpX9560ynKyLDv - yOzQlM2VuZ7H2hSIeYOFgrtHJJwhDtzjmUNDQpQdp9Fx+LONQTS1VLCTXND2i/3F - 10X6PkdnLEn09RiPt5qy20pQkICxoEydmlwpFs32musYfJPdBPkZqZWrwINBv2Wb - HfOmEB4xUvXufZ5Ju5icgggBkyNA3PCLo0GZFRrMtvA7i9IXOcXNR+njhKa9246V - QQfeWiz05RmIvgShJYVsnZWtael8ni366d+UXypBYncohimyNlAD1n+Bh3z0PvBB - +FK4JgOSeouM4SuBHdwmlZ/H0mvfUG81Y8Jbrw0yuRHtuCtX5HpN5GKpZPHDE7aQ - fEShVB/GElC3n3DvgK9OJBeVVhYQgUEfJi4rsSxt3cdEI0NrdckUoZbApWVJ3CBc - F8Y7 + MIIFDzCCAvegAwIBAgIUX0P6NfX4gRUpFz+TNV/f26GHokgwDQYJKoZIhvcNAQEL + BQAwFjEUMBIGA1UEAwwLU25ha2VvaWwgQ0EwIBcNMjAwODI0MDc0MjEyWhgPMjEy + MDA3MzEwNzQyMTJaMBYxFDASBgNVBAMMC1NuYWtlb2lsIENBMIICIjANBgkqhkiG + 9w0BAQEFAAOCAg8AMIICCgKCAgEA3dRuzhaVyKB5668XcPoYiVQ2Op0AwyhbfRQS + sJb+8doQr1+258rx2i+x+tXPvNDHBjyEq0J9/jI7kWbqsGsePQ3XTV2xreFqhpce + CwHiN+zoDVFM/X6Da9qww1e+OL8KdePzw9X956qVnzoM87IfK8WnNJmeUnvR8TiK + SOzUTbhyY4+x1meGMXjr4tvPa5qbtCT3KduZ48O4ehTXx7vBhqd+FI+sAMbm3Ucn + 1YlfM/RTH24JS7gPYtTokstzUKavFcARvrv9Iguz0LEI8Uq2oELtubHwE2CKxSUO + GQr4dJ8aijHsjzwYunQHDKWtgGQKrar/gsFnaN+gbUuV4gu6wKYGJ/srXikB0m5w + ohtlv26Em34PZUZN8ONXREhDQgA1Woy29xKL76dLQTvwQC7nb1o8wD26V5XlTa+p + 4FrRpbGUwuy1w4AanVtipc6WRnM/j1twE5cIqf2RUbewNebuXVZFj1aD7kNMNU8P + oPXcVhUzZN4ftneyvOyMUG3L6sXiA0hFRTK8aNHuAhtrnTHHpWcAEZeojUwBE2ts + yVtF7QHRlTPh2NUv5FOlPSd57mw7bQJADAAYz8Moyxu4X8lqlB3/cj7OPRrH7QFb + yMvFyHrtLIQ9QRtdf1c78KVAokXPm7blotnq2eGXz6EOWKEvYLeEviKc+0zxgZfg + FJPRztkCAwEAAaNTMFEwHQYDVR0OBBYEFNhBZxryvykCjfPO85xB3wof2enAMB8G + A1UdIwQYMBaAFNhBZxryvykCjfPO85xB3wof2enAMA8GA1UdEwEB/wQFMAMBAf8w + DQYJKoZIhvcNAQELBQADggIBAEZwlsQ+3yd1MVxLRy9RjoA8hI7iWBNmvPUyNjlb + l/L9N+dZgdx9G5h/KPRUyzvUc/uk/ZxTWVPIOp13WI65qwsBKrwvYKiXiwzjt+9V + CKDRc1sOghTSXk4FD3L5UcKvTQ2lRcFsqxbkopEwQWhoCuhe4vFyt3Nx8ZGLCBUD + 3I5zMHtO8FtpZWKJPw46Yc1kasv0nlfly/vUbnErYfgjWX1hgWUcRgYdKwO4sOZ7 + KbNma0WUsX5mWhXo4Kk7D15wATHO+j9s+j8m86duBL3A4HzpTo1DhHvBi0dkg0CO + XuSdByIzVLIPh3yhCHN1loRCP2rbzKM8IQeU/X5Q4UJeC/x9ew8Kk+RKXoHc8Y2C + JQO1DxuidyDJRhbb98wZo2YfIsdWQGjYZBe1XQRwBD28JnB+Rb9shml6lORWQn9y + P/STo9uWm5zvOCfqwbnCoetljDweItINx622G9SafBwPZc3o79oL7QSl8DgCtN6g + p0wGIlIBx+25w/96PqZcrYb8B7/uBHJviiKjBXDoIJWNiNRhW5HaFjeJdSKq7KIL + I/PO9KuHafif36ksG69X02Rio2/cTjgjEW1hGHcDRyyJWWaj7bd2eWuouh6FF22b + PA6FGY4vewDPnbLKLaix2ZIKxtedUDOH/qru3Mv58IFXmQ4iyM8oC8aOxYSQLZDn + 1yJD -----END CERTIFICATE----- ''; "acme.test".key = builtins.toFile "acme.test.key" '' -----BEGIN RSA PRIVATE KEY----- - MIIJKAIBAAKCAgEAlgQTZjKfs3aHw0J993k7jFAs+hVRPf//zHMAiUkPKUYPTSl1 - TxS/bPbhWzSoom00j4SLhGGGhbd+lnvTg0uvKbxskgATfw5clbm1ZN+gx4DuxwjL - V3xIxpeSY+PKzs5z8w/k+AJh+zOPyXwH3ut3C+ogp1S/5IhmzV3a/yU/6k0zpGxj - N6ZPRTXFrz93I1pPeCkJz90l7tj+2uFc9xtM20NQX52f0Y2oShcG8fKdNZVzuHHk - ZXkrZIhou55/nRy2jKgFeD3GQQfa9rwPWrVybQ6tKMMkoazB/Unky9xcTI2LJarf - xgHDO9v9yFBvmR4UM8B3kM82NHoENtHaZ2mmiMGZzTEQlf8xwYyHFrqBFIVRWEUr - 7rr/O5Qr9gIN0T4u367HCexVYAKzbO2P9h75czzjMMoGkbXze9SMQ/ikrxEmwAHg - r1Xxh6iQYmgPNk8AR3d9+o2I7WJZMUYZARLnuhVr9BNXv510iqZTqX8lcyL5fEj3 - ST4Ab+H7rfevZt6NU26iJLBYAjrA2mSvH+wvkboxrgSS8xYPkOW8NLNEbbodzofI - pB+SaK53OIk0bj9c1YAgrSNER/TDTgDXrWUNrlfVZ/M7+AEdeU06wi7sVhVif6OB - D3OpgKSNjeE6TuJH80Pi5MWugSFBr792Xb6uhVoPiVOFN+qiGB6UkwBgSKkCAwEA - AQKCAgAmN7OZfZwh5DiCDhZ5TXFWNba/n16rJOTN+R5R20L5iNetGLrCAs8hu2N+ - ENRFTPzu8x14BEB5IF4niDRCZq2hPFeMemh9HfOIUV9c63vSV459NkhXaVpA/axV - tlqchQwVCB+U70Z28JPZCLgYmnQhnOvktTqNxhIqj5aTGbJGxpQ5d0Nvkfbv8tsB - 4nE/mGpWel39jqFzT+Tdbjx414Ok+GkpcsacZDJTbbpfOSfD1uc8PgepskzTt8y2 - v5JTPFVlUAjUsSgouQ+XfCGNQlx8XBjRIaXbal+hX4niRald91FTr0yC7UAHp+vn - dFZ586fB526OfbuZctxP+vZhEhFSseQKxHQ0tB8me81xH44daVNr9PPUM69FDT3j - ygJaUJjNEG3vVzePCDzhmxTmz2/rAClp77WTWziBWDoA6YWDDzhgNPrXWzLIbZIx - ue9ZbGEOh/u5ZzrEXxKCz9FjDe9wQu3TeYUe0M+ejzwWgn7zdWDvjjmtLUUuun2Y - wW7WANpu32qvB/V+qssw4O63tbRiwneRCnb8AF2ixgyWr6xyZwch4kacv1KMiixf - gO/5GTj7ba5GcdGoktJb29cUEgz13yPd106RsHK4vcggFxfMbOVauNRIo6ddLwyS - 8UMxLf2i2cToOLkHZrIb8FgimmzRoBd3yYzwVJBydiVcsrHQAQKCAQEAxlzFYCiQ - hjEtblGnrkOC7Hx6HvqMelViOkGN8Y9VczG4GhwntmSE2nbpaAKhFBGdLfuSI3tJ - Lf24f0IGgAhzPmpo2TjbxPO3YSKFTH71fznVBhtQ1iSxwZ1InXktnuhot6VSDx6A - sbHSy1hMFy3nj+Zj5+fQ89tclzBzG9bCShaauO39KrPMwKi6CYoYdGhXBC3+OpHY - zBNvmDTxG2kW8L42rlf14EH4pAlgKs4eeZbpcbZ6fXURP2hToHJ8swyKw/1p12WA - cc19BKFJXL8nNP4uCf/fI0mVYpytz5KwUzG+z+umDqk+RRCH4mNB28xvEEuEyp/e - /C5Is+WrlDAA6QKCAQEAwZsK4AJ/w4Xf4Q/SsnZJO9bfP1ejJjzKElt8rG28JXeb - +FjykZZ6vw2gt2Boest2n9N4fBwaRkaHVtVS4iAmaDXozTlcvCLs2rVjPSguuQtW - 80CKg6+dux+6gFN8IGzDCiX3pWUnhhiXvCcRYEcvgpH6GA5vuCNrXrjH0JFC0kef - aaDMGMTbzhc2IIRztmWU4v8YJSSy5KOkIQLWO+7u9aGx9IqT5/z3gx3XrItyl0Bk - aQmZEh7JOSyhmGhhf5LdeTLu2YgRw3/tzS+lPMX3+UPw99k9MdTOFn2pww5AdRmg - aBIzV+/LBYG0pPRl0D8/6yzGVBPuUDQpmK9Z3gsxwQKCAQEAnNkMZN2Ocd1+6+V7 - LmtJog9HTSmWXMEZG7FsOJ661Yxx44txx2IyPsCaDNlPXxwSaiKrSo0Yr1oZQd8G - XsTPw4HGiETSWijQTulJ99PH8SLck6iTwdBgEhV5LrN75FQnQVdizHu1DUzrvkiC - Wi29FWb6howiCEDjNNVln5SwKn83NpVQgyyK8ag4+oQMlDdQ3wgzJ0Ld53hS3Eq4 - f5EYR6JQgIki7YGcxrB3L0GujTxMONMuhfdEfRvUTGFawwVe0FyYDW7AIrx2Z2vV - I5YuvVNjOhrt6OwtSD1VnnWCITaLh8LwmlUu3NOWbudHUzKSe5MLXGEPo95BNKad - hl5yyQKCAQBNo0gMJtRnawMpdLfwewDJL1SdSR6S0ePS0r8/Qk4l1D5GrByyB183 - yFY/0zhyra7nTt1NH9PlhJj3WFqBdZURSzUNP0iR5YuH9R9Twg5ihEqdB6/EOSOO - i521okTvl83q/ui9ecAMxUXr3NrZ+hHyUWmyRe/FLub6uCzg1a+vNauWpzXRZPgk - QCijh5oDdd7r3JIpKvtWNs01s7aHmDxZYjtDrmK7sDTtboUzm0QbpWXevUuV+aSF - +gDfZlRa3WFVHfisYSWGeYG6O7YOlfDoE7fJHGOu3QC8Ai6Wmtt8Wgd6VHokdHO8 - xJPVZnCBvyt5up3Zz5hMr25S3VazdVfBAoIBAHVteqTGqWpKFxekGwR0RqE30wmN - iIEwFhgOZ8sQ+6ViZJZUR4Nn2fchn2jVwF8V8J1GrJbTknqzAwdXtO3FbgfmmyF2 - 9VbS/GgomXhA9vJkM4KK3Iwo/y/nE9hRhtzuVE0QPudz2fyfaDgnWjcNM59064tH - 88361LVJm3ixyWSBD41UZ7NgWWJX1y2f073vErsfcPpavF5lhn1oSkQnOlgMJsnl - 24qeuzAgTWu/2rFpIA2EK30Bgvsl3pjJxHwyNDAgklV7C783LIoAHi7VO7tzZ6iF - dmD5XLfcUZc3eaB7XehNQKBXDGLJeI5AFmjsHka5GUoitkU2PFrg/3+nJmg= + MIIJKgIBAAKCAgEA3dJl4ByHHRcqbZzblszHIS5eEW3TcXTvllqC1nedGLGU9dnA + YbdpDUYhvWz/y9AfRZ1d8jYz01jZtt5xWYG0QoQUdkCc9QPPh0Axrl38cGliB6IZ + IY0qftW9zrLSgCOUnXL/45JqSpD57DHMSSiJl3hoOo4keBaMRN/UK6F3DxD/nZEs + h+yBBh2js3qxleExqkX8InmjK9pG8j7qa4Be5Lh4iILBHbGAMaxM7ViNAg4KgWyg + d5+4qB86JFtE/cJ+r3D62ARjVaxU6ePOL0AwS/vx5ls6DFQC7+1CpGCNemgLPzcc + 70s0V0SAnF73xHYqRWjJFtumyvyTkiQWLg0zDQOugWd3B9ADuaIEx2nviPyphAtj + M3ZKrL2zN1aIfqzbxJ/L8TQFa2WPsPU2+iza/m9kMfLXZ4XPF/SJxQ+5yVH+rxx5 + OWrXZ13nCMyeVoaXQofmG7oZvOQbtuT9r5DQZd9WN0P3G3sy0/dNnlNVn8uCBvXJ + TQhRKsy1FESZdgcFNtpJEG7BRG9Gc6i0V39aSRzShZyKJSBQhlc0FMTlX445EYsh + PKjEC/+Suq9wy/LuLjIkkqBbVg4617IlibLz0fDY/yrZqkfSqhCVsWnra21Ty3Mp + vD+wnskTzuGrvCVTe3KcWp+wkeH0xvhr8FXX6nn492YCfvZSITO3FF+qWt8CAwEA + AQKCAgEAk2xV0NCk66yNwjPRrTOD1IWgdyzqrijtYpvdAPSWL+c1/P8vYMIoy22k + 1uQuTSKQ5g9kdKmZYAlZCLRl2Pre9qYZg04GAsD5mAYN/rjwITWotTICSc4sRAeC + EnG+fPMovkvDzVdt1QjtURD3mFeculKH0wLNMhKqPswTkrvJCPZfLDVjxyJjzdC9 + D3enttjnzSaeH7t/upFjPXSbD79NUe1YDkH4XuetL1Y3+jYz4P279bBgJaC9dN7s + IWWXQJ+W2rrXu+GOs03JUXjZe4XJk3ZqmpJezfq3yQWCmQSigovLjcPvMwpkSut4 + HnTvbl6qUV8G5m4tOBMNcL8TDqAvIGY8Q2NAT0iKJN187FbHpjSwQL/Ckgqz/taJ + Q82LfIA1+IjwW372gY2Wge8tM/s3+2vOEn2k91sYfiKtrRFfrHBurehVQSpJb2gL + YPoUhUGu4C1nx44sQw+DgugOBp1BTKA1ZOBIk6NyS/J9sU3jSgMr88n10TyepP6w + OVk9kcNomnm/QIOyTDW4m76uoaxslg7kwOJ4j6wycddS8JtvEO4ZPk/fHZCbvlMv + /dAKsC3gigO2zW6IYYb7mSXI07Ew/rFH1NfSILiGw8GofJHDq3plGHZo9ycB6JC+ + 9C8n9IWjn8ahwbulCoQQhdHwXvf61t+RzNFuFiyAT0PF2FtD/eECggEBAPYBNSEY + DSQc/Wh+UlnwQsevxfzatohgQgQJRU1ZpbHQrl2uxk1ISEwrfqZwFmFotdjjzSYe + e1WQ0uFYtdm1V/QeQK+8W0u7E7/fof4dR6XxrzJ2QmtWEmCnLOBUKCfPc7/4p4IU + 7Q8PDwuwvXgaASZDaEsyTxL9bBrNMLFx9hIScQ9CaygpKvufilCHG79maoKArLwX + s7G16qlT4YeEdiNuLGv0Ce0txJuFYp7cGClWQhruw+jIbr+Sn9pL9cn8GboCiUAq + VgZKsofhEkKIEbP1uFypX2JnyRSE/h0qDDcH1sEXjR9zYYpQjVpk3Jiipgw4PXis + 79uat5/QzUqVc1sCggEBAObVp686K9NpxYNoEliMijIdzFnK5J/TvoX9BBMz0dXc + CgQW40tBcroU5nRl3oCjT1Agn8mxWLXH3czx6cPlSA8fnMTJmev8FaLnEcM15pGI + 8/VCBbTegdezJ8vPRS/T9c4CViXo7d0qDMkjNyn22ojPPFYh8M1KVNhibDTEpXMQ + vJxBJgvHePj+5pMOIKwAvQicqD07fNp6jVPmB/GnprBkjcCQZtshNJzWrW3jk7Fr + xWpQJ8nam8wHdMvfKhpzvD6azahwmfKKaQmh/RwmH4xdtIKdh4j+u+Ax+Bxi0g7V + GQfusIFB1MO48yS6E56WZMmsPy+jhTcIB4prIbfu4c0CggEBALgqqUKwRc4+Ybvj + rfUk+GmT/s3QUwx/u4xYAGjq7y/SgWcjG9PphC559WPWz/p2sITB7ehWs5CYTjdj + +SgWKdVY/KZThamJUTy4yAZ8lxH1gGpvvEOs+S8gmGkMt88t8ILMPWMWFW7LoEDp + PL74ANpLZn29GROnY1IhQQ3mughHhBqfZ6d2QnaDtsGYlD5TBvPSLv7VY7Jr9VR0 + toeEtAjMRzc+SFwmgmTHk9BIB1KTAAQ3sbTIsJh8xW1gpo5jTEND+Mpvp10oeMVe + yxPB2Db4gt/j8MOz3QaelbrxqplcJfsCjaT49RHeQiRlE/y070iApgx8s0idaFCd + ucLXZbcCggEBANkcsdg9RYVWoeCj3UWOAll6736xN/IgDb4mqVOKVN3qVT1dbbGV + wFvHVq66NdoWQH4kAUaKWN65OyQNkQqgt/MJj8EDwZNVCeCrp2hNZS0TfCn9TDK/ + aa7AojivHesLWNHIHtEPUdLIPzhbuAHvXcJ58M0upTfhpwXTJOVI5Dji0BPDrw47 + Msw3rBU6n35IP4Q/HHpjXl58EDuOS4B+aGjWWwF4kFWg2MR/oqWN/JdOv2LsO1A/ + HnR7ut4aa5ZvrunPXooERrf6eSsHQnLcZKX4aNTFZ/pxZbJMLYo9ZEdxJVbxqPAa + RA1HAuJTZiquV+Pb755WFfEZy0Xk19URiS0CggEAPT1e+9sdNC15z79SxvJQ4pmT + xiXat+1pq9pxp5HEOre2sSAd7CF5lu/1VQd6p0gtLZY+Aw4BXOyMtzYWgIap+u9j + ThFl9qrTFppG5KlFKKpQ8dQQ8ofO1akS8cK8nQeSdvrqEC/kGT2rmVdeevhBlfGy + BZi2ikhEQrz5jsLgIdT7sN2aLFYtmzLU9THTvlfm4ckQ7jOTxvVahb+WRe/iMCwP + Exrb83JDo31jHvAoYqUFrZkmPA+DUWFlrqb21pCzmC/0iQSuDcayRRjZkY/s5iAh + gtI6YyAsSL8hKvFVCC+VJf1QvFOpgUfsZjrIZuSc3puBWtN2dirHf7EfyxgEOg== -----END RSA PRIVATE KEY----- ''; "acme.test".cert = builtins.toFile "acme.test.cert" '' -----BEGIN CERTIFICATE----- - MIIEoTCCAokCAgKaMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNVBAMMC1NuYWtlb2ls - IENBMCAXDTIwMDMyMjIyNTYxOFoYDzIxMjAwMjI3MjI1NjE4WjAUMRIwEAYDVQQD - DAlhY21lLnRlc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCWBBNm - Mp+zdofDQn33eTuMUCz6FVE9///McwCJSQ8pRg9NKXVPFL9s9uFbNKiibTSPhIuE - YYaFt36We9ODS68pvGySABN/DlyVubVk36DHgO7HCMtXfEjGl5Jj48rOznPzD+T4 - AmH7M4/JfAfe63cL6iCnVL/kiGbNXdr/JT/qTTOkbGM3pk9FNcWvP3cjWk94KQnP - 3SXu2P7a4Vz3G0zbQ1BfnZ/RjahKFwbx8p01lXO4ceRleStkiGi7nn+dHLaMqAV4 - PcZBB9r2vA9atXJtDq0owyShrMH9SeTL3FxMjYslqt/GAcM72/3IUG+ZHhQzwHeQ - zzY0egQ20dpnaaaIwZnNMRCV/zHBjIcWuoEUhVFYRSvuuv87lCv2Ag3RPi7frscJ - 7FVgArNs7Y/2HvlzPOMwygaRtfN71IxD+KSvESbAAeCvVfGHqJBiaA82TwBHd336 - jYjtYlkxRhkBEue6FWv0E1e/nXSKplOpfyVzIvl8SPdJPgBv4fut969m3o1TbqIk - sFgCOsDaZK8f7C+RujGuBJLzFg+Q5bw0s0Rtuh3Oh8ikH5Jornc4iTRuP1zVgCCt - I0RH9MNOANetZQ2uV9Vn8zv4AR15TTrCLuxWFWJ/o4EPc6mApI2N4TpO4kfzQ+Lk - xa6BIUGvv3Zdvq6FWg+JU4U36qIYHpSTAGBIqQIDAQABMA0GCSqGSIb3DQEBCwUA - A4ICAQBCDs0V4z00Ze6Ask3qDOLAPo4k85QCfItlRZmwl2XbPZq7kbe13MqF2wxx - yiLalm6veK+ehU9MYN104hJZnuce5iEcZurk+8A+Pwn1Ifz+oWKVbUtUP3uV8Sm3 - chktJ2H1bebXtNJE5TwvdHiUkXU9ywQt2FkxiTSl6+eac7JKEQ8lVN/o6uYxF5ds - +oIZplb7bv2XxsRCzq55F2tJX7fIzqXrSa+lQTnfLGmDVMAQX4TRB/lx0Gqd1a9y - qGfFnZ7xVyW97f6PiL8MoxPfd2I2JzrzGyP/igNbFOW0ho1OwfxVmvZeS7fQSc5e - +qu+nwnFfl0S4cHRif3G3zmz8Ryx9LM5TYkH41qePIHxoEO2sV0DgWJvbSjysV2S - EU2a31dJ0aZ+z6YtZVpHlujKMVzxVTrqj74trS4LvU5h/9hv7e1gjYdox1TO0HMK - mtDfgBevB21Tvxpz67Ijf31HvfTmCerKJEOjGnbYmyYpMeMNSONRDcToWk8sUwvi - OWa5jlUFRAxgXNM09vCTPi9aRUhcFqACqfAd6I1NqGVlfplLWrc7SWaSa+PsLfBf - 4EOZfk8iEKBVeYXNjg+CcD8j8yk/oEs816/jpihIk8haCDRWYWGKyyGnwn6OQb8d - MdRO2b7Oi/AAmEF3jMlICqv286GIYK5qTKk2/CKHlOLPnsWEuA== + MIIEwDCCAqigAwIBAgICApowDQYJKoZIhvcNAQELBQAwFjEUMBIGA1UEAwwLU25h + a2VvaWwgQ0EwIBcNMjAwODI0MDc0MjEzWhgPMjEyMDA3MzEwNzQyMTNaMBQxEjAQ + BgNVBAMMCWFjbWUudGVzdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB + AN3SZeAchx0XKm2c25bMxyEuXhFt03F075ZagtZ3nRixlPXZwGG3aQ1GIb1s/8vQ + H0WdXfI2M9NY2bbecVmBtEKEFHZAnPUDz4dAMa5d/HBpYgeiGSGNKn7Vvc6y0oAj + lJ1y/+OSakqQ+ewxzEkoiZd4aDqOJHgWjETf1Cuhdw8Q/52RLIfsgQYdo7N6sZXh + MapF/CJ5oyvaRvI+6muAXuS4eIiCwR2xgDGsTO1YjQIOCoFsoHefuKgfOiRbRP3C + fq9w+tgEY1WsVOnjzi9AMEv78eZbOgxUAu/tQqRgjXpoCz83HO9LNFdEgJxe98R2 + KkVoyRbbpsr8k5IkFi4NMw0DroFndwfQA7miBMdp74j8qYQLYzN2Sqy9szdWiH6s + 28Sfy/E0BWtlj7D1Nvos2v5vZDHy12eFzxf0icUPuclR/q8ceTlq12dd5wjMnlaG + l0KH5hu6GbzkG7bk/a+Q0GXfVjdD9xt7MtP3TZ5TVZ/Lggb1yU0IUSrMtRREmXYH + BTbaSRBuwURvRnOotFd/Wkkc0oWciiUgUIZXNBTE5V+OORGLITyoxAv/krqvcMvy + 7i4yJJKgW1YOOteyJYmy89Hw2P8q2apH0qoQlbFp62ttU8tzKbw/sJ7JE87hq7wl + U3tynFqfsJHh9Mb4a/BV1+p5+PdmAn72UiEztxRfqlrfAgMBAAGjGDAWMBQGA1Ud + EQQNMAuCCWFjbWUudGVzdDANBgkqhkiG9w0BAQsFAAOCAgEAM5WrCpBOmLrZ1QX8 + l6vxVXwoI8pnqyy3cbAm3aLRPbw4gb0Ot90Pv/LoMhP0fkrNOKwH/FGRjSXyti0X + TheKrP7aEf6XL2/Xnb8rK2jYMQo6YJU9T+wBJA6Q+GBrc8SE75KfOi5NWJr8T4Ju + Etb+G05hXClrN19VFzIoz3L4kRV+xNMialcOT3xQfHtXCQUgwAWpPlwcJA/Jf60m + XsfwQwk2Ir16wq+Lc3y+mQ7d/dbG+FVrngFk4qN2B9M/Zyv4N9ZBbqeDUn3mYtJE + FeJrwHgmwH6slf1gBN3gxUKRW7Bvzxk548NdmLOyN+Y4StsqbOaYGtShUJA7f1Ng + qQqdgvxZ9MNwwMv9QVDZEnaaew3/oWOSmQGAai4hrc7gLMLJmIxzgfd5P6Dr06e4 + 2zwsMuI8Qh/IDqu/CfmFYvaua0FEeyAtpoID9Y/KPM7fu9bJuxjZ6kqLVFkEi9nF + /rCMchcSA8N2z/vLPabpNotO7OYH3VD7aQGTfCL82dMlp1vwZ39S3Z1TFLLh3MZ+ + BYcAv8kUvCV6kIdPAXvJRSQOJUlJRV7XiI2mwugdDzMx69wQ0Zc1e4WyGfiSiVYm + ckSJ/EkxuwT/ZYLqCAKSFGMlFhad9g1Zyvd67XgfZq5p0pJTtGxtn5j8QHy6PM6m + NbjvWnP8lDU8j2l3eSG58S14iGs= -----END CERTIFICATE----- ''; } diff --git a/nixos/tests/robustirc-bridge.nix b/nixos/tests/robustirc-bridge.nix new file mode 100644 index 00000000000..a5c22d73a34 --- /dev/null +++ b/nixos/tests/robustirc-bridge.nix @@ -0,0 +1,29 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +{ + name = "robustirc-bridge"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ hax404 ]; + }; + + nodes = + { bridge = + { services.robustirc-bridge = { + enable = true; + extraFlags = [ + "-listen localhost:6667" + "-network example.com" + ]; + }; + }; + }; + + testScript = + '' + start_all() + + bridge.wait_for_unit("robustirc-bridge.service") + bridge.wait_for_open_port(1080) + bridge.wait_for_open_port(6667) + ''; +}) diff --git a/nixos/tests/systemd-networkd.nix b/nixos/tests/systemd-networkd.nix index 319e5e94ece..d5fb2431dba 100644 --- a/nixos/tests/systemd-networkd.nix +++ b/nixos/tests/systemd-networkd.nix @@ -7,18 +7,19 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: { virtualisation.vlans = [ 1 ]; environment.systemPackages = with pkgs; [ wireguard-tools ]; boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ]; - systemd.tmpfiles.rules = [ - "f /run/wg_priv 0640 root systemd-network - ${privk}" - ]; systemd.network = { enable = true; netdevs = { "90-wg0" = { netdevConfig = { Kind = "wireguard"; Name = "wg0"; }; wireguardConfig = { - PrivateKeyFile = "/run/wg_priv"; + # NOTE: we're storing the wireguard private key in the + # store for this test. Do not do this in the real + # world. Keep in mind the nix store is + # world-readable. + PrivateKeyFile = pkgs.writeText "wg0-priv" privk; ListenPort = 51820; - FwMark = 42; + FirewallMark = 42; }; wireguardPeers = [ {wireguardPeerConfig={ Endpoint = "192.168.1.${peerId}:51820"; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 18f2b4f67cd..20526c8c6c5 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sound editor with graphical UI"; - homepage = "http://audacityteam.org/"; + homepage = "https://www.audacityteam.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lheckemann ]; platforms = intersectLists platforms.linux platforms.x86; # fails on ARM diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 114cf5e192f..f173d2fe02b 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -11,13 +11,13 @@ with stdenv.lib; mkDerivation rec { pname = "fmit"; - version = "1.2.13"; + version = "1.2.14"; src = fetchFromGitHub { owner = "gillesdegottex"; repo = "fmit"; rev = "v${version}"; - sha256 = "1qyskam053pvlap1av80rgp12pzhr92rs88vqs6s0ia3ypnixcc6"; + sha256 = "1q062pfwz2vr9hbfn29fv54ip3jqfd9r99nhpr8w7mn1csy38azx"; }; nativeBuildInputs = [ qmake itstool wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/netease-cloud-music/default.nix b/pkgs/applications/audio/netease-cloud-music/default.nix deleted file mode 100644 index c4cc291d026..00000000000 --- a/pkgs/applications/audio/netease-cloud-music/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv, lib, fontconfig, zlib, libGL, glib, pango -, gdk-pixbuf, freetype, atk, cairo, libsForQt5, xorg -, sqlite, taglib, nss, nspr, cups, dbus, alsaLib -, libpulseaudio, deepin, qt5, harfbuzz, p11-kit -, libgpgerror, libudev0-shim, makeWrapper, dpkg, fetchurl }: -let - rpath = lib.makeLibraryPath [ - fontconfig.lib - zlib - stdenv.cc.cc.lib - libGL - glib - pango - gdk-pixbuf - freetype - atk - cairo - libsForQt5.vlc - sqlite - taglib - nss - nspr - cups.lib - dbus.lib - alsaLib - libpulseaudio - xorg.libX11 - xorg.libXext - xorg.libXtst - xorg.libXdamage - xorg.libXScrnSaver - xorg.libxcb - xorg.libXi - deepin.qcef - qt5.qtwebchannel - qt5.qtbase - qt5.qtx11extras - qt5.qtdeclarative - harfbuzz - p11-kit - libgpgerror - ]; - - runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; - -in stdenv.mkDerivation rec { - pname = "netease-cloud-music"; - version = "1.2.0"; - src = fetchurl { - url = "http://d1.music.126.net/dmusic/netease-cloud-music_1.2.0_amd64_deepin_stable_20190424.deb"; - sha256 = "0hg8jqim77vd0fmk8gfbz2fmlj99byxcm9jn70xf7vk1sy7wp6h1"; - curlOpts = "-A 'Mozilla/5.0'"; - }; - unpackCmd = "${dpkg}/bin/dpkg -x $src ."; - sourceRoot = "."; - - nativeBuildInputs = [ qt5.wrapQtAppsHook makeWrapper ]; - - installPhase = '' - mkdir -p $out - cp -r usr/* $out - ''; - - preFixup = '' - local exefile="$out/bin/netease-cloud-music" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exefile" - patchelf --set-rpath "$out/libs:$(patchelf --print-rpath "$exefile"):${rpath}" "$exefile" - - wrapProgram $out/bin/netease-cloud-music \ - --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ - --set QCEF_INSTALL_PATH "${deepin.qcef}/lib/qcef" - ''; - - meta = { - description = "Client for Netease Cloud Music service"; - homepage = "https://music.163.com"; - platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.mlatus ]; - license = stdenv.lib.licenses.unfreeRedistributable; - }; -} diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index a0813fa0c80..47ea078c4b2 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,37 +1,34 @@ -{ stdenv, fetchFromGitHub, python2Packages, chromaprint }: +{ stdenv, fetchFromGitHub, python3Packages, chromaprint }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "puddletag"; - version = "1.2.0"; + version = "2.0.1"; src = fetchFromGitHub { - owner = "keithgg"; - repo = "puddletag"; - rev = "v${version}"; - sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz"; + owner = "keithgg"; + repo = "puddletag"; + rev = version; + sha256 = "sha256-9l8Pc77MX5zFkOqU00HFS8//3Bzd2OMnVV1brmWsNAQ="; }; - setSourceRoot = '' - sourceRoot=$(echo */source) - ''; + sourceRoot = "source/source"; - disabled = python2Packages.isPy3k; # work to support python 3 has not begun - - propagatedBuildInputs = [ chromaprint ] ++ (with python2Packages; [ + propagatedBuildInputs = [ chromaprint ] ++ (with python3Packages; [ configobj mutagen pyparsing - pyqt4 + pyqt5 ]); doCheck = false; # there are no tests + dontStrip = true; # we are not generating any binaries meta = with stdenv.lib; { description = "An audio tag editor similar to the Windows program, Mp3tag"; - homepage = "https://docs.puddletag.net"; - license = licenses.gpl3; + homepage = "https://docs.puddletag.net"; + license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix index 75990d593df..c0986880c09 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -4,7 +4,7 @@ , faacSupport ? false, faac ? null , flacSupport ? true, flac ? null , soxSupport ? true, sox ? null -, vorbisSupport ? true, vorbisTools ? null +, vorbisSupport ? true, vorbis-tools ? null }: assert mp3Support -> lame != null; @@ -12,7 +12,7 @@ assert opusSupport -> opusTools != null; assert faacSupport -> faac != null; assert flacSupport -> flac != null; assert soxSupport -> sox != null; -assert vorbisSupport -> vorbisTools != null; +assert vorbisSupport -> vorbis-tools != null; let zeroconf = pythonPackages.callPackage ./zeroconf.nix { }; @@ -37,7 +37,7 @@ pythonPackages.buildPythonApplication { ++ stdenv.lib.optional faacSupport faac ++ stdenv.lib.optional flacSupport flac ++ stdenv.lib.optional soxSupport sox - ++ stdenv.lib.optional vorbisSupport vorbisTools; + ++ stdenv.lib.optional vorbisSupport vorbis-tools; # upstream has no tests checkPhase = '' diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 5da8f4cd462..af59bb56eb9 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "qsynth"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz"; - sha256 = "0cp6vrqrj37rv3a7qfvqrg64j7zwpfj60y5b83mlkzvmg1sgjnlv"; + sha256 = "0xiqmpzpxjvh32vivfj6h33w0ahmyfjzjb41b6fnf92bbg9k6mqv"; }; nativeBuildInputs = [ autoconf pkgconfig ]; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 1cbd5b3afa2..0ae65cb8c37 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { pname = "renoise"; - version = "3.2.1"; + version = "3.2.2"; src = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" "https://web.archive.org/web/https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" ]; - sha256 = "0dhcidgnjzd4abw0xw1waj9mazp03nbvjcr2xx09l8gnfrkvny46"; + sha256 = "1v249kmyidx55kppk3sry7yg6hl1a91ixhnwz36h4y134fs7bkrl"; } else releasePath diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 68eefadf411..cf3f173a096 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gettext, intltool, wrapGAppsHook -, python3Packages, gnome3, gtk3, gsettings-desktop-schemas, gobject-introspection }: +{ stdenv, fetchFromGitHub, wrapGAppsHook, gettext +, python3Packages, gnome3, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: let inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools; @@ -16,26 +16,38 @@ in buildPythonApplication rec { disabled = !isPy3k; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ + gettext + gobject-introspection + wrapGAppsHook + ]; + buildInputs = [ - intltool wrapGAppsHook + glib gnome3.adwaita-icon-theme gsettings-desktop-schemas + gtk3 + gdk-pixbuf ]; + # The optional tagpy dependency (for editing metadata) is not yet + # included because it's difficult to build. + pythonPath = [ + dbus-python + mpd2 + pygobject3 + setuptools + ]; + + # Otherwise the setup hook for gobject-introspection is not run: + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + postPatch = '' # Remove "Local MPD" tab which is not suitable for NixOS. sed -i '/localmpd/d' sonata/consts.py ''; - propagatedBuildInputs = [ - gobject-introspection gtk3 pygobject3 setuptools - ]; - - # The optional tagpy dependency (for editing metadata) is not yet - # included because it's difficult to build. - pythonPath = [ dbus-python pygobject3 mpd2 ]; - meta = { description = "An elegant client for the Music Player Daemon"; longDescription = '' diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index e8b6a4d4313..2593bf38d19 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -1,8 +1,8 @@ # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo -, libmad, libogg, lrdf, librdf_raptor, librdf_rasqal, libsamplerate -, libsndfile, pkgconfig, libpulseaudio, qtbase, qtsvg, redland +, libmad, lrdf, librdf_raptor, librdf_rasqal, libsamplerate +, libsndfile, pkg-config, libpulseaudio, qtbase, qtsvg, redland , rubberband, serd, sord, vamp-plugin-sdk, fftwFloat , capnproto, liboggz, libfishsound, libid3tag, opusfile , wrapQtAppsHook @@ -10,13 +10,14 @@ stdenv.mkDerivation rec { pname = "sonic-visualiser"; - version = "4.0.1"; + version = "4.2"; src = fetchurl { - url = "https://code.soundsoftware.ac.uk/attachments/download/2607/${pname}-${version}.tar.gz"; - sha256 = "14674adzp3chilymna236qyvci3b1zmi3wyz696wk7bcd3ndpsg6"; + url = "https://code.soundsoftware.ac.uk/attachments/download/2755/${pname}-${version}.tar.gz"; + sha256 = "1wsvranhvdl21ksbinbgb55qvs3g2d4i57ssj1vx2aln6m01ms9q"; }; + nativeBuildInputs = [ pkg-config wrapQtAppsHook ]; buildInputs = [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 lrdf rubberband libsamplerate vamp-plugin-sdk alsaLib librdf_raptor librdf_rasqal redland @@ -27,7 +28,6 @@ stdenv.mkDerivation rec { # portaudio libpulseaudio libmad - libogg # ? libfishsound liblo libX11 @@ -37,15 +37,13 @@ stdenv.mkDerivation rec { opusfile ]; - nativeBuildInputs = [ pkgconfig wrapQtAppsHook ]; - - enableParallelBuilding = true; - # comment out the tests preConfigure = '' sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-visualiser.pro ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "View and analyse contents of music audio files"; homepage = "https://www.sonicvisualiser.org/"; diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index c7e936d28e5..74f68283fd6 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "synthv1"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz"; - sha256 = "08n83krkak20924flb9azhm9hn40lyfvn29m63zs3lw3wajf0b40"; + sha256 = "047y2l7ipzv00ly54f074v6p043xjml7vz0svc7z81bhx74vs0ix"; }; buildInputs = [ qtbase qttools libjack2 alsaLib liblo lv2 ]; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 3a0bef24ab7..14a6853af1c 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -19,9 +19,9 @@ let sha256Hash = "11lkwcbzdl86cyz4lci65cx9z5jjhrc4z40maqx2r5hw1xka9290"; }; latestVersion = { # canary & dev - version = "4.2.0.7"; # "Android Studio 4.2 Canary 7" - build = "201.6720134"; - sha256Hash = "1c9s6rd0z596qr7hbil5rl3fqby7c8h7ma52d1qj5rxra73k77nz"; + version = "4.2.0.8"; # "Android Studio 4.2 Canary 8" + build = "202.6787931"; + sha256Hash = "0y5fzr22dknzxay1bhd1ymhdnmdrpccdw8dswy2z9bxjsvq65n62"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index 8fe93d37c7e..b04c575dded 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -38,6 +38,7 @@ let meta = with stdenv.lib; { description = "Neovim client library and GUI, in Qt5"; + homepage = "https://github.com/equalsraf/neovim-qt"; license = licenses.isc; maintainers = with maintainers; [ peterhoeg ]; inherit (neovim.meta) platforms; diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 049ba45f7af..3c55cffdcf1 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , makeWrapper -, electron_8 +, electron_9 , dpkg , gtk3 , glib @@ -13,15 +13,15 @@ }: let - electron = electron_8; + electron = electron_9; in stdenv.mkDerivation rec { pname = "typora"; - version = "0.9.89"; + version = "0.9.95"; src = fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "0gk8j13z1ymad34zzcy4vqwyjgd5khgyw5xjj9rbzm5v537kqmx6"; + sha256 = "0kgzk7z707vlbjrvykrnw2h6wscmc3h5hxycyz1z1j2cz26fns4p"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix deleted file mode 100644 index 0e3a4a15052..00000000000 --- a/pkgs/applications/editors/vim/qvim.nix +++ /dev/null @@ -1,113 +0,0 @@ -args@{ fetchgit, stdenv, ncurses, pkgconfig, gettext -, lib, config, python, perl, tcl, ruby, qt4 -, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu -, libICE -, lua -, features -, luaSupport ? config.vim.lua or true -, perlSupport ? config.vim.perl or false # Perl interpreter -, pythonSupport ? config.vim.python or true -, rubySupport ? config.vim.ruby or true -, nlsSupport ? config.vim.nls or false -, tclSupport ? config.vim.tcl or false -, multibyteSupport ? config.vim.multibyte or false -, cscopeSupport ? config.vim.cscope or false -, netbeansSupport ? config.netbeans or true # eg envim is using it - -# by default, compile with darwin support if we're compiling on darwin, but -# allow this to be disabled by setting config.vim.darwin to false -, darwinSupport ? stdenv.isDarwin && (config.vim.darwin or true) - -# add .nix filetype detection and minimal syntax highlighting support -, ftNixSupport ? config.vim.ftNix or true - -, ... }: with args; - -let tag = "20140827"; - sha256 = "0ncgbcm23z25naicxqkblz0mcl1zar2qwgi37y5ar8q8884w9ml2"; -in { - - name = "qvim-7.4." + tag; - - enableParallelBuilding = true; # test this - - src = fetchgit { - url = "https://bitbucket.org/equalsraf/vim-qt.git"; - rev = "refs/tags/package-" + tag; - inherit sha256; - }; - - # FIXME: adopt Darwin fixes from vim/default.nix, then chage meta.platforms.linux - # to meta.platforms.unix - preConfigure = assert (! stdenv.isDarwin); ""; - - configureFlags = [ - "--with-vim-name=qvim" - "--enable-gui=qt" - "--with-features=${features}" - "--disable-xsmp" - "--disable-xsmp_interact" - "--disable-workshop" # Sun Visual Workshop support - "--disable-sniff" # Sniff interface - "--disable-hangulinput" # Hangul input support - "--disable-fontset" # X fontset output support - "--disable-acl" # ACL support - "--disable-gpm" # GPM (Linux mouse daemon) - "--disable-mzscheme" - ] - ++ stdenv.lib.optionals luaSupport [ - "--with-lua-prefix=${lua}" - "--enable-luainterp" - ] - ++ stdenv.lib.optional pythonSupport "--enable-pythoninterp" - ++ stdenv.lib.optional (pythonSupport && stdenv.isDarwin) "--with-python-config-dir=${python}/lib" - ++ stdenv.lib.optional nlsSupport "--enable-nls" - ++ stdenv.lib.optional perlSupport "--enable-perlinterp" - ++ stdenv.lib.optional rubySupport "--enable-rubyinterp" - ++ stdenv.lib.optional tclSupport "--enable-tcl" - ++ stdenv.lib.optional multibyteSupport "--enable-multibyte" - ++ stdenv.lib.optional darwinSupport "--enable-darwin" - ++ stdenv.lib.optional cscopeSupport "--enable-cscope"; - - nativeBuildInputs = [ ncurses pkgconfig libX11 libXext libSM libXpm libXt libXaw - libXau libXmu libICE qt4 - ] - ++ stdenv.lib.optional nlsSupport gettext - ++ stdenv.lib.optional perlSupport perl - ++ stdenv.lib.optional pythonSupport python - ++ stdenv.lib.optional tclSupport tcl - ++ stdenv.lib.optional rubySupport ruby - ++ stdenv.lib.optional luaSupport lua - ; - - postPatch = '' - '' + stdenv.lib.optionalString ftNixSupport '' - # because we cd to src in the main patch phase, we can't just add this - # patch to the list, we have to apply it manually - cd runtime - patch -p2 < ${./ft-nix-support.patch} - cd .. - ''; - - postInstall = stdenv.lib.optionalString stdenv.isLinux '' - rpath=`patchelf --print-rpath $out/bin/qvim`; - for i in $nativeBuildInputs; do - echo adding $i/lib - rpath=$rpath:$i/lib - done - echo $nativeBuildInputs - echo $rpath - patchelf --set-rpath $rpath $out/bin/qvim - ''; - - dontStrip = 1; - - meta = with stdenv.lib; { - description = "The most popular clone of the VI editor (Qt GUI fork)"; - homepage = "https://bitbucket.org/equalsraf/vim-qt/wiki/Home"; - license = licenses.vim; - maintainers = with maintainers; [ smironov ttuegel ]; - platforms = platforms.linux; - }; -} - diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 4782d920148..82128f81353 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -7,11 +7,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "feh"; - version = "3.4.1"; + version = "3.5"; src = fetchurl { url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; - sha256 = "0yvvj1s7ayn0lwils582smwkmckdk0gij5c58g45n4xh981n693q"; + sha256 = "07jklibpi4ig9pbdrwhllsfffxn2h8xf4ma36qii00w4hb69v3rq"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix index 1c1c6ba08ee..2962825e49b 100644 --- a/pkgs/applications/graphics/gcolor3/default.nix +++ b/pkgs/applications/graphics/gcolor3/default.nix @@ -1,31 +1,40 @@ -{ stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook -, fetchpatch }: +{ stdenv +, fetchFromGitLab +, meson +, ninja +, gettext +, pkg-config +, libxml2 +, gtk3 +, libportal +, wrapGAppsHook +}: -let - version = "2.3.1"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gcolor3"; - inherit version; + version = "2.4.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "gcolor3"; rev = "v${version}"; - sha256 = "10cfzlkflwkb7f51rnrxmgxpfryh1qzvqaydj6lffjq9zvnhigg7"; + sha256 = "rHIAjk2m3Lkz11obgNZaapa1Zr2GDH7XzgzuAJmq+MU="; }; - patches = [ - # Remove useage of deprecrated G_PARAM_PRIVATE - (fetchpatch { - url = "https://gitlab.gnome.org/World/gcolor3/commit/96612cdd6c2cc71e28eb97ee17956004a05e5140.patch"; - sha256 = "134wv5x15bd7k0fjzifrddwssaq213sx2l38r3xw6x1j625qwzq9"; - }) + nativeBuildInputs = [ + meson + ninja + gettext + pkg-config + libxml2 # xml-stripblanks preprocessing of GResource + wrapGAppsHook ]; - nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ]; - - buildInputs = [ gtk3 hicolor-icon-theme ]; + buildInputs = [ + gtk3 + libportal + ]; postPatch = '' chmod +x meson_install.sh # patchShebangs requires executable file @@ -34,7 +43,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A simple color chooser written in GTK3"; - homepage = "https://www.hjdskes.nl/projects/gcolor3/"; + homepage = "https://gitlab.gnome.org/World/gcolor3"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 3549a16e270..c041d2dde8c 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.31.1"; + version = "0.31.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mbgrad4d4snffw2z3rkhwqq1bkxdgy52pblx99vjadvpgspb034"; + sha256 = "0ywzr6vgcz8yy60v0jp55na9lgqi4dbh2vakfphkcml1gpah0r2l"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 4d078f39224..ac296c1224a 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , wrapQtAppsHook , python3 -, python3Packages , zbar , secp256k1 , enableQt ? true @@ -22,6 +21,20 @@ let version = "4.0.2"; + # electrum is not compatible with dnspython 2.0.0 yet + # use the latest 1.x release instead + py = python3.override { + packageOverrides = self: super: { + dnspython = super.dnspython.overridePythonAttrs (oldAttrs: rec { + version = "1.16.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01"; + }; + }); + }; + }; + libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" else if stdenv.isDarwin then "libsecp256k1.0.dylib" @@ -45,7 +58,7 @@ let }; in -python3Packages.buildPythonApplication { +py.pkgs.buildPythonApplication { pname = "electrum"; inherit version; @@ -61,7 +74,7 @@ python3Packages.buildPythonApplication { nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with py.pkgs; [ aiohttp aiohttp-socks aiorpcx @@ -116,7 +129,7 @@ python3Packages.buildPythonApplication { wrapQtApp $out/bin/electrum ''; - checkInputs = with python3Packages; [ pytest ]; + checkInputs = with py.pkgs; [ pytest ]; checkPhase = '' py.test electrum/tests diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 77c1f67ecf0..ccb7f3e47c8 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -35,13 +35,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.36.4"; + version = "3.36.5"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1s6qrmbn3pywidwwfa24ly21c1cz6fnnsipi9vlp3sxswbdcwiwz"; + sha256 = "0nyb33p4y6nmln41pi70c8hiyjyasaryy10mazi7b2s6fy9pk25x"; }; patches = [ diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index 9e3022457a0..b19b1b86cf5 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "worker"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; - sha256 = "1k2svpzq01n1h9365nhi7r2k7dmsviczxi9m6fb80ccccdz7i530"; + sha256 = "02xrdg1v784p4gfqjm1mlxqwi40qlbzhp68p5ksj96cjv6av5b5s"; }; buildInputs = [ libX11 ]; diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 618a6fc519d..e8e5109351e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "79.0"; + version = "80.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ach/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ach/firefox-80.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "25571c5d9aa4294f84d3e8aceb501efcadcc7d80dae799ee7246391782079885"; + sha256 = "4679b0ce4913b2c240f873fe5898234362d0b2cd6777e73ce272f37950edfd02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/af/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/af/firefox-80.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "400edad1b17de72f33237d5c0fbe20dee9a2032aac41745339d62eaafd36b157"; + sha256 = "ae2f6e7d46344f56599ef1e7ba3f3321636ee378e8e1a4c0b8e652c5e71b932b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/an/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/an/firefox-80.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "13971db840762cbe9b54c917c1cae459259df1bfc8783d0659accf539dc0bf05"; + sha256 = "8ae2ea7f6184f5f0cd5bc937924cfc5d813bb8bb0ea3e4e0770352b15291c043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ar/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ar/firefox-80.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "7c8f5692e483667ccc173d9205ab5b5b77b4e4d50a5643f4ac531b1809a97d80"; + sha256 = "54926c7b61e4d99f1d49f709fad198604c5e5af165d60a96c6f5cb1a94f73884"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ast/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ast/firefox-80.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "50cc5928b1877be40e29f30b51cfd183d9196bf73f68234866eff9e0e50c2e36"; + sha256 = "589262534a8665387cbbb3c13f5003738bca4c5673884bda831a4858aa73de54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/az/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/az/firefox-80.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "6f8f0b486652ac7bb4e3808a02b123acbd4babd6b272c503c6fc14159278d492"; + sha256 = "60bfac6b93deff04f63c67dc9944d3df8efb314054ed6ee8f93d3b09db8608b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/be/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/be/firefox-80.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "f2dd77674d83b888e2016177eb80c7855a7fa26318ec052fbb919fd2abab6561"; + sha256 = "48cdbcb785f190dce708db6ca1fc711d5d2411da0f544b3a5d03aba6665efa1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bg/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/bg/firefox-80.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "08514f73d202ed1f53f0ef23de3093ac7eb08049fedf3bb09b69c98148efb99b"; + sha256 = "a48fbe5f88ec729c1becbf7c63957ee48cd7692d153dcf709dd038ce1a218317"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/bn/firefox-80.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "7f5114a60d966e2dedb95c1b65696bd3b04d25eb057b9a109d8bb0dc43b46f40"; + sha256 = "38245ddeeaa699941f54ba3d3d0fc3e804b57d4e8a6a0d1c58cf25d7c271a23c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/br/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/br/firefox-80.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "816dbbdd0f86874aad38733a30b54e683c7b18557c34d977ced6cd17ddf8b125"; + sha256 = "6766542a98977e6f2329b76345ab8f59d545479f1564261a47c0cb7b7db1e3d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/bs/firefox-80.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "6c975f990120e9c70121eea464e9c375df40f6aa78275922d005096135044067"; + sha256 = "9bcd21931680502a9a5459f82a6d103d8b367b09cfa9048f54d87ca654e39e34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ca-valencia/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ca-valencia/firefox-80.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "e993527db5fac86e5a503cb7615c073363d73c733837f7acc66b30d17b7a369d"; + sha256 = "a666b19726a6d10863cf351059dc45f610cd0356e2220a8d9e2a5bf2df0fde3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ca/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ca/firefox-80.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "8ac5bfa08c2f082816c4f7bc45a0ebdadd04a078efcd172049899890ddcc3ffc"; + sha256 = "458e791ac8025a56a7a9444aeb8aa1138f5108c5a5cd1d87a31bbe71c6ed51ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cak/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/cak/firefox-80.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "76680375d4f2ffb8f70414e2f934fe442e30d50c1921f7eb596f1325ee01a155"; + sha256 = "890f462890cdc825e138d174e396b78e10f74111d01da47514a8e449ee470676"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/cs/firefox-80.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "99f83abcdc15839e879b7cced936fc3bb628d8b42f5381dad980d444d4fcfe1f"; + sha256 = "98e1bec6f176bc83da232b76b33e6dfe09db91c4be1424cf0c7b4e18e26b8d5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cy/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/cy/firefox-80.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "d81fee7d2b5b8177f1b28f4e4d05f4b266b876adcf5ed62a7d458465ca50bf42"; + sha256 = "06b649bc87eea5c81fa37873582a963d972cbc3d0a65fa9fcc12c67c107ccfbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/da/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/da/firefox-80.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "40fdbaa88e3ac77d4cc846bf01b00ba1cdb5d3241f7af8a47efc92c929c862e1"; + sha256 = "98328f0f7ec2b807717fd4ae6aaeb7daaae8a962eb929b760598f225f6d9e784"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/de/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/de/firefox-80.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "6635eb71b5f4dc01ceed02771cc4e7bf7b3ba340c75f471fb7ecfde8170f838b"; + sha256 = "401877f41fd2bda02d0cbb7737f029f648e1d2b3c9642b093ef8bd4342f13712"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/dsb/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/dsb/firefox-80.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "afe56bea25e44fbd3cd1fff7411cc20473ed0212500304ed865a985c2565594c"; + sha256 = "408ae85999139ba5c027bbf9ca20157b991e741349aae77176c012b862a7b4ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/el/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/el/firefox-80.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b83801b722069d476bdb3325051f6e0bf2c34b6081320b82824aaf218d0f968a"; + sha256 = "430c1062e9edc9bc4a0a47268782cb7928214df074aec17e2e3a283b7bfa69d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-CA/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/en-CA/firefox-80.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "e5a1a6e755cf35287f455a36c2019157fc7a0de6296c0af5949f7d33c55c871b"; + sha256 = "7f8d97a5643c959eb09119264c8829c7b7227c01f8e035b17f3c21eee3d1e0c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-GB/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/en-GB/firefox-80.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "709d89f99e96d76a77b0a1a40d7f2ef49d6709b41336973c114fc25fee2f1d49"; + sha256 = "d2361c90c46dc43eae25ff53440157322351645d6a20ed077e2496fbc3b955bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-US/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/en-US/firefox-80.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "d57ce2ec9d39d4f0e1100a2faf7cfdc827eeb45db672511d5a6aea7229430f85"; + sha256 = "84191f06dd927cd16b8c0900e6c330f68cc8012bc48e9277891282a2d6f7bce7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/eo/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/eo/firefox-80.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "facef477b06aab7d67580c6931d97a26c5a7a9ae9555d92c7f31227d0e944dcd"; + sha256 = "8a9f5359cbb0d8a0d173d3302181ab41f463d8cf6b17f9c06e33432a95d79b0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-AR/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-AR/firefox-80.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "43449d930cfd29ff06a1f38b3a36cf7b2bb7aa4feef1a4509f60f1370f08539e"; + sha256 = "0f5e7d4a23daab7c96cf706fe1c5a62d9a244d39bf6be97325cfcc1d699936c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-CL/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-CL/firefox-80.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "fd821e8cf3c2f67f0993d08dc43026b1f5454a91102dc44706587d5744a63d1c"; + sha256 = "fd914b5892f2aa297054e79c6d6d863f1b4d88ab1a2bfae3d40192848c9efd64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-ES/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-ES/firefox-80.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "b1db4d75e75bd4329cc8ff4e637f920ebab47384442fae56584f170421a18657"; + sha256 = "b87aa07e99d0c8d3a17c76bc7e281f8309cda97565bbfa4dff653326fb2bbcb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-MX/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-MX/firefox-80.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "b08ce5a33ada7d551b341693545ec7d9c30afc4529a3e33f55836a4e2bec1a41"; + sha256 = "ffb619b95658d5001a036e0906689f12520cc25d541c4b5b154e44e4b176da33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/et/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/et/firefox-80.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "5fea2b490a7323cf9cec5e02fd148aab16c18a4bc107b1f267ca2b442eb2d53e"; + sha256 = "2558280c2fa85aa3a2fdfc59994de6a593ccbb6a7141e76c21e5318152b6e992"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/eu/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/eu/firefox-80.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "98f89c8e3efcdc3585c6cd0cd6de6b5ab7ab7a55266328a2fd6198e1b739fd7f"; + sha256 = "0ad66a2dd10d1e5b0d44e6db28982d82430acb7cef6e465ad0c88fd7958606ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fa/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fa/firefox-80.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "874beed2e6b23f7edc7b51465a758243468e99e835951bb908336f16dc7baf0c"; + sha256 = "39b1bc086dd14ced01668961dac12a5408f5cc261188b2c32b6114dc70c67e4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ff/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ff/firefox-80.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "f84e37769376d2a05fd1d76903ff75c79e3631c2c7c5ceccdadde59de991aead"; + sha256 = "1511c50bd3ced8f570fe409ef609a6c9dc626d061156e5091e667b9314a5c4a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fi/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fi/firefox-80.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "8898a7ba0aefe3e26c4239c8b4d3768f716004b18da5ce5799ac5fb159b699b0"; + sha256 = "4d9e7fe4eaa94e4a2195589cdaf9f58c4b55339751001e87bd42a6326ee26787"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fr/firefox-80.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "3f6e7cd8ffa7bf343d28cd289ea14f88e4e0ccf7229ff122c118627ba909a400"; + sha256 = "99f293639744dd8e2615bc4d6290d2f5baeb9d646bc796d3bfac5de8a1c001f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fy-NL/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fy-NL/firefox-80.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "de4d6f8aa0564ff23eed16f2bb41486a62ed4fad935625eb1d26829aa281d71c"; + sha256 = "a8628d16e51d7355198415f086186c9874f37f9250e64512457aa725c8ba9f04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ga-IE/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ga-IE/firefox-80.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "48a595094b959f74455f568d872b3426bb6ad9be60df256d5cc1d5ac7cc688a2"; + sha256 = "df63d7991979e8fdf8f6911f8df2122d9995c50c089596bc0f7c0e7179326051"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gd/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gd/firefox-80.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "8c64d89f708238affb2bc356a5f86b491d368f6b838371c62ed647291925e72a"; + sha256 = "616906a45df46004e081cba3cdadd2782c3d402619193f5d19142977b7ff0fcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gl/firefox-80.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "2d391f67f0f911112332a155436e5013ebb505620e5070d03b794949df2a4f36"; + sha256 = "bbff8f63ba3c029c97e5d40d3ecb41d757b5fccd59018dc81d7484f12c830686"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gn/firefox-80.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "732951a35fc0ab79327a225ee02494eff4a17a8b5b348764f980610fcb1de6ef"; + sha256 = "62d7fbf8afb95d221df768fc190381a859e142a253b8df6b63ee276c4111077e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gu-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gu-IN/firefox-80.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "0c3f65ab3736b43832feea9459a6fc336d0611c3221eba091c6194494eaf252c"; + sha256 = "3e451729a93e315c9ae767d21c5fe25c505e327ab435c5a9c4f606e04ca61051"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/he/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/he/firefox-80.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c62d4e52a2f308061fc6348531b708cfb26c0aee71a5f08f33b265af1789ea54"; + sha256 = "a48159e9c2798308ca4765f02ac90a0a2b05029ae0505ad59688d281fc06344f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hi-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hi-IN/firefox-80.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "e83f4fa9cd50d2389697b78eb6591b7d1c1a6b4a61ae91b429909cb3cdbe1a99"; + sha256 = "39341543e9e8e2d5a377ead92287413df77d2f1c00a7362eb42d8e640b8f75ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hr/firefox-80.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "10ccf56a6f388a49ab6b5aa24ab3d82cf3ee685af5fd9592fec35055c1195d48"; + sha256 = "0067b77ff388004e0c60855868f1a45a282282b8c7360847b65ad2b53a558010"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hsb/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hsb/firefox-80.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "771b5bba633c08861acc056cf0cbd73752f6109f601b8d59685dcad23804e3db"; + sha256 = "5c3a47a28a8e67f6a5be72540d9ae85474e093b1a67254949794918a8294ded6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hu/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hu/firefox-80.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "0f8631c95cc683d0c9faa5153cd3b499fa89374f6d8c2d0ef161074b03355d2b"; + sha256 = "2c6e390d9348d2d9c1f2adc30b73c451aa6fdd281dfc040fa79dc7365a5414f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hy-AM/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hy-AM/firefox-80.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "e3f6989cf2716b455d5d962c88307a74cd57d57c8585f31a4007579534b168a3"; + sha256 = "ba3d7371aae296aa6417e3c5d2b4647c0d0d0cb4f20441be525f2dd2ad594125"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ia/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ia/firefox-80.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "aa769627a633e32b8bab9dc1e0cb3e4030a9d6af36c66a6fd365520eb978a7a3"; + sha256 = "799ba99b5e5c9568d94c7ee7a3bc482eb6d827830ecdc8aef9a2e4d9b157634a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/id/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/id/firefox-80.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "179529666d1dce606758f7a7ee700e1823a7c4f5840195ed57a5eb48f2ce21ac"; + sha256 = "97f9f9194178918d8af8453b165aaede0a236e75b973a8ab0374a36ea4a8f8cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/is/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/is/firefox-80.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "53f5231e74ee28eef4ecf954ac850f1e6070fb7be51e7c8a0aa8477e0c9325e3"; + sha256 = "f63efcd86ece79d4a996c23e22a1876e3db25bfc09e5132e1832c309711d9012"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/it/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/it/firefox-80.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "410c0c6f119b70006a947ea34ed1462247f4cfda996cf9797423784c8833776f"; + sha256 = "c1d5fcbe8a3fba613e5da888f5252043663b7a1fb801da5cf54934af11ea5782"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ja/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ja/firefox-80.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "38f1f110e1490626908dad0e8f638453e70adc2afe66da5ae834a889e0ed13b4"; + sha256 = "75c5d37fdf2a488b0dbfb09c6bd020db90d699713350ca3c091d5e8096d41d18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ka/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ka/firefox-80.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "bd38f5fe5707a0ca0aee0de7d1ec8afcc92fa0faa8661b724b876c0faf5bccf7"; + sha256 = "364b16782a4948e986268aca5e07dd92367120e97aa1d3bcfd5b78e58f58025c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kab/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/kab/firefox-80.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "d7c748eeeb4d26433147b02d08b57f41be742b86480220d4fa7ae08823ae7984"; + sha256 = "20a5bfaf08f75040d1c627f79ff8cb133d0574c83cb13f8902367e88a3742bfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/kk/firefox-80.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "8e3f43b8551b9844aeccfb21390ae1ce59eb7acde612efa4d9eeb4bcfc81bf60"; + sha256 = "f61bce593069f598b8b8fc035b09607f423d5600df7cb620360fb1aaf4cce68a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/km/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/km/firefox-80.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "44819213495492477fc7401b816f45b2a7d3d4e6b5b04b2b5dbb73380fc60ef0"; + sha256 = "7056f40cc5fc9d59145f4e08a4b19aad8e2b473beb4d8a7b09d636559bcd8457"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/kn/firefox-80.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "89b97b079894174c2826e6106806d6bf9a46a3499e0e458a8219ba9f5ce6722e"; + sha256 = "c18b07bc5ee941f001e3ba9336d677f51b60dc08c2bf516b68882f647475b5b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ko/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ko/firefox-80.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "731f9a98b4edfcf249fd08f94e8849a8f1c396ed577c0a1ed921b2d58863d029"; + sha256 = "7b58b30aa461119ef842ee886d06676fb5b00d05547e959bbaae4ab597cdcda6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lij/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/lij/firefox-80.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "a3325d7298d0cffc04757e3d4617725145ab5dcb11d359b029f92e70cfa47905"; + sha256 = "8107773361daf1257a1a77d853ae5baa1e9ff393d16118fb1987723f2a7af33b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lt/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/lt/firefox-80.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "2071fa08893ca0b55181478c677669577c9011e8f4d39b499aaec939046e45e4"; + sha256 = "356a337cdb3ea658e6723897da2f8d99179ebfac01d071f641c661eea1da52c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lv/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/lv/firefox-80.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "b6639a338afa0fe86e0324d844740caa9260b26e3f06d075348999253f0a0bc7"; + sha256 = "10a9272101d4b37ac5949f2606317da5f41d205cfdc0967cacd9c72aba550cbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/mk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/mk/firefox-80.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "e06db923b89559735663c93b551f31e48cd12b86f5fc7fdf78e8db88fba48d59"; + sha256 = "45618096f39f0c6e28a900e2a5985fc1ce5c9fbcd6abeeb2d21fb4b5bc095876"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/mr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/mr/firefox-80.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "dcd161187ddb20eaad0353c7ba0bf7d5d0149c8bc324151d41d013e5756a7e35"; + sha256 = "63d774fdd4f825780c7f667365a560b72dd1f31449d408553f8c51dfb6583dc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ms/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ms/firefox-80.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "d309a899fe69b3b17a33c43093ce78e1942b497e3e3db252a46968884bb9d737"; + sha256 = "fa67faa072b03b64132320a19691eadc719f8598167aa39f21d097b1e8fe42ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/my/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/my/firefox-80.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "9f74bf01425741e1c08d5a637e20b3df7e5aefc0421da14eb3ecc8199a03a0d9"; + sha256 = "e40c7c534108dc7e9f978d3e6ea025e41b0e6120b9dd701a7935f90a7c4b834a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nb-NO/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/nb-NO/firefox-80.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "638a017eb9d5f7402565dd293c44b236460be99d718fa43cfa705a55eca949e3"; + sha256 = "99b52d2ecd2ce0154378630f80f3bb9371d0cb7c59d780e8abcbd47f7008a7c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ne-NP/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ne-NP/firefox-80.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "d7d0b87b0f3aa4c8cfe1d6a44b011c167b48e19384031a302d0e0eb5bf422951"; + sha256 = "49e9e67f879ecc519001ba500d136285c89a0fef3f7b8b1a693e8efd2af152cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/nl/firefox-80.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "88a6ed36cf8116634010f5a1ab27fb22f2519974ba10dd48deb2a6fbb2ac659e"; + sha256 = "ada875468cd865efa4023bfecc0cde06469fa3bf655944a2dfb945603d3ad483"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nn-NO/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/nn-NO/firefox-80.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "aa6475e941d6e2f724447a94c2000f9f8983d872a317d4ccb1df421128687564"; + sha256 = "b04996dccdb1a34ae41066a58090eb1be8fef2d458cf1aeb0297650123ffbce8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/oc/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/oc/firefox-80.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "2535537159fd34b6680cb676d607e3810f78d2db2130e35c1086210c8fc40c0e"; + sha256 = "c6db46006f3bdaacd7a4ede17166e2bbcb4ef672d432363e86a819858327d867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pa-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pa-IN/firefox-80.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "ddf3f2da7c31bf2b52e9dc4ad9f3d2b25c42e4c621594bb48a9213d2a18ea91a"; + sha256 = "a52fde04d6f25f6ff0641ade83dbb88f4d15aff689a041cad36352705fcb43ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pl/firefox-80.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "efb57f54e1cdf5a99b84856fa12d8591cc970d5850bab7595a5e804458b1f430"; + sha256 = "6918dd7bbde254eef27b740147d64550a1b4203979fedec6f9064006300e4638"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pt-BR/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pt-BR/firefox-80.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "704d84a395b6d24b33723121785cc17d36ffb95eec1c550895f61277add01cba"; + sha256 = "21bd4c8b68c7154889f4d06cec9eb3696dde94e2ec2b946f25a627ade2b16a7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pt-PT/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pt-PT/firefox-80.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "c8f67765c2bd151c68a973135ad67c46287aa11bd8055b1ee084e7c18bdc7a38"; + sha256 = "b30ab69cacd27d7a60a0387caea18712cfd4f4e2dd45f7bb51e3074e46dc3f05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/rm/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/rm/firefox-80.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "5fe367fc5338a867cf16322fd4cfb55899275825a6aababbcc95be1f2df54a79"; + sha256 = "9fdba8959e1276684bdd53c2c3d02e80768f3e9a289bccacf5a719f5ce51efbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ro/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ro/firefox-80.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "f22ce12f453e7c08a1fa1277f80a24038a2906d556c5d96fd6c331b185f38bcb"; + sha256 = "e31d0a914b107736fb83e686c5c011b912b7a5b04fb394b7e769c40ab249b504"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ru/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ru/firefox-80.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "057a5c87914e98c056a2213c348bbe72be46cad8566d7cdb0f68370b19f4b313"; + sha256 = "3b26ecd7fd38e224625def5087fe5e6ff1aa408e3a04a06e160e688402026113"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/si/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/si/firefox-80.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "9b97d6588b9f304e090dd5c0258f0209fc7229ccf7ce21d6fb0d6da1f829dd38"; + sha256 = "bb37483590bfe23951063e15626724a665cb03de6ce2916992ebad88759f2691"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sk/firefox-80.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "621fb92cccbf325edf25ea274e90fe9533a0ce5fdb1e0bd9f266b4a1f3a47ffa"; + sha256 = "60be0fae9156d425708360e233a39e8b1d2be45216d8a155d06f020fb5808cd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sl/firefox-80.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "f840e911bebf98a7917f15421fcd8feaeb72097659bd3fb0f3d1fcd2e348ec75"; + sha256 = "d1261f9dc8091df947df5e64b5123d8d4b39bf15ba6dbe5fc4844bce9f3be220"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/son/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/son/firefox-80.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "9b834f1895db63a263d3f2ce2567095b8000ad39d0753020f69a704dac7d12f7"; + sha256 = "76ae5c6f4890d5c29ee33ffd81923696f755e6fe0fa8081c75e72ed1599e5070"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sq/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sq/firefox-80.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "7136196b26f6e9b963d86e1cd9a088f9d2a7751e08193a59dd27c00b08da4d4f"; + sha256 = "5aa679e980bd0808b0c924e4ad11bb6b3256afd031cb04f16f862eb9bfd4644d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sr/firefox-80.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "6cd5ce0c122a3b9cb6c066ab8df57277bec7d78e4fab9f15ef88c7ca16a6a3e1"; + sha256 = "a4941d40721de72abf22b97846cc16de49670d7f096829aa0d1775089734d36e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sv-SE/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sv-SE/firefox-80.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "ed0104efacbe6c4054b5d6a2c4397c13db38d245bd557dfe8ed876334bb232a1"; + sha256 = "c50a2d0bb15cc95982e3d2997719a65eba6e0099ffb13b066e66e5aa951375fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ta/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ta/firefox-80.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "4589d31f7ba58e6f149ddf64f6020b262cfa9a7b8c228ddbad5ac9032013bb74"; + sha256 = "53651d5b0ea3d36c6600c57f02c27202f2f5b938aef34de4164f325ef46d8666"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/te/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/te/firefox-80.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "3bae0a5ae9735ba623b8f3b4f333169f4f99fc37c43ee29e65221aae21060d9e"; + sha256 = "5225d57d4a5c83843ecc83735be2fbb4004d4411da5ea72340cd6306078fc426"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/th/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/th/firefox-80.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "eac036a449108ee78cf3d527a85abcb87b0c116d78e71d7a0274f326ebcf1218"; + sha256 = "b38092aef16253b180dfe0d297ee1bb8417dbb4851466625b80858a18b2d3801"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/tl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/tl/firefox-80.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "f8c9053e62b80b7ad1f20e622c25d01b8926c89b8780f1ae642d922d293d5018"; + sha256 = "5ac9aa87ad90d60a852f7cbfc611c05eeef09b2aba46da80a2ddb093ce5f1730"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/tr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/tr/firefox-80.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "8c6d089c9b0a1acdddbaf01d44b274da4a7d01751239dd017add9c7a0867dd38"; + sha256 = "b2a6aa22523f9d3396675c60ca7590e9c379a15c445727f01c3ada090a0557fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/trs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/trs/firefox-80.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "086b1b43a42f3c1487ead061b822b94274dd58b927df5b481f8079b960b52dc3"; + sha256 = "0e3e21f8c76bba90e730959e3f176c5b4406196a4b9f00aa4d85088495eeb337"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/uk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/uk/firefox-80.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e3ee4bf352916f57bece093a079ef58f68a1d3c60d39e02ac7ba9587b98b6cf9"; + sha256 = "626f9af6252a003cf869067de439197d8b0dd0b73e654310f439579959036f5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ur/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ur/firefox-80.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "7e485392f74814c874c2efd153add419a110c790514f4fef4bad0a4c5043751f"; + sha256 = "67e1108697c033ba3c6bcce7e36e5ab269f66a75674795e931aeeefadd7e949f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/uz/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/uz/firefox-80.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7a9f0e8e1a776d1155c609bce03380ecad60c2259a05248ddabb65a6c2f8080f"; + sha256 = "90e6d82c75ee24925cc6fdb48674e7ace3e58fd2cf27441d8ba9b24002b03a03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/vi/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/vi/firefox-80.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "a50f5c651093bb205f5cf7d1c44c12994d0aa73cf3a3cf1dea22e3754c6943e0"; + sha256 = "dff1e18e968d514b91d4f3c419da0570478e1667485761be703349b5c6019124"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/xh/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/xh/firefox-80.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "a94a46b428a87a3cd543dfcdbef46708931e18b377c548b11ca565067c953ebb"; + sha256 = "1d524f5c5e6003c4cb1e00676ab5c369752c80c763684d7550224c7bdc66ca68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/zh-CN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/zh-CN/firefox-80.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "911e0b9591dea07aab26e4e35e84645d79c132fcfcabe504ff242ac87d853834"; + sha256 = "8893528da90e46d8eb287ab857ee6e18d89355d7901e221c7820d7f1bdfc155f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/zh-TW/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/zh-TW/firefox-80.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "58afd8192b08eb343da9385344b87ad0e72046cdda26495a5534a75f12d40d38"; + sha256 = "8b01036a6c807e22f66ccd93fa335e3fe71476e7a9993965172b85d2eada27ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ach/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ach/firefox-80.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "055e0f66d0e5e3c9f3bc7ae94f6bd46a8ab0bb87dcefc2cace02f4ebbbabbf33"; + sha256 = "1bb95b52770a8cad2b339874ac4576e190790935dfbfccf22cfa8be41e3b7e5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/af/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/af/firefox-80.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "0705f3f63655b6b55604d9b2b801ea07bacf2f0060ce6a2ca6c1d6021c35a594"; + sha256 = "919522f2c9d8f0b3c7f7c7d4311735e68eee173883c80f4d168625b690d0f29c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/an/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/an/firefox-80.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "f1735cdcb500df69cf66886f194d101393f8e5880b790fc135348e6515fc7ba5"; + sha256 = "878eba95507de8dc1788e01facd9710e39cb62d75229d6204601c58ea0df4cf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ar/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ar/firefox-80.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "97dc4e314f361d7afc3e77d13d712f45306af21e4ef2e5737409b9932b341f92"; + sha256 = "4bfc935eb7a94eb6cb957b118c4811cbc0d1265a9fbcd4b4ecd3aea593658af1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ast/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ast/firefox-80.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "2cb19f22bc6372d4b3406d87b19acc4ec61cf60317869392145b7405a820b7ea"; + sha256 = "c64157e1ef1c361cf1dff89ed443f9b7fceab088c3bdac4058e262a1c068c97d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/az/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/az/firefox-80.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "83fe4b78ca684c9a58702451e4f8bbc9ee4a67aeb066d74699f7e3d471e0a16c"; + sha256 = "6045ef88f6cda1ac9b87854c7ac0dbfe789f9a4b4f7d35f9612beff57d832b60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/be/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/be/firefox-80.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "f08a685b2b99d3f508487215e426af802097599752ab82dfbd801c063588194a"; + sha256 = "6c0e25a6610a0da75f086a829a142f1b7f419e1357d7c97efaba4f1a9c95b5d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bg/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/bg/firefox-80.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "a5d3c78d91e813358e7b1c33c10854f43112398ee88310c078aa0b5db00b7518"; + sha256 = "1c8579439940499262e8e2096f16bd6767441b72a00774a35d76db9463fdaf34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/bn/firefox-80.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "eab386c0bc37dbe0ab2c8b51a470bc9f65a8f59ad17223d95fe631507da8fefa"; + sha256 = "06eaec1ac31a6c2dc21eaa871aa2dd4f45a299458d5cc950c2d52454366ba1b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/br/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/br/firefox-80.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "125e5bfe77bac8d9155b07d057e3e8e8de3c3b4bb3aa3de192f2ae55ab9f4e33"; + sha256 = "3f8a1a9204ba24d2367f6ad995343eccdb48c981d726ed72e6f96b3579bb504f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/bs/firefox-80.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "6d9fafc803b098e8fe93911e9d07baa28765dff6b072aa911f74b2076cef54f3"; + sha256 = "61da2d6bb7dc90615949b10ab45ac56d38ccd4007ab6f0ff730454994d303f6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ca-valencia/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ca-valencia/firefox-80.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "91d71b2538e059c9aed1d7a564125c25bca6f6c8213eb247aea7357b1f27b9a3"; + sha256 = "15ea7d6e7eee13f2100111b8c9fd10cba728acdc27575ad0160b5baa5c5ba0f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ca/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ca/firefox-80.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "5088cc39fd0b18926e6821348373f834a8b5d093ccaf9152cfc8da3157522734"; + sha256 = "140c3b74f0edd7ad47c07dfd5cff6fd224048560ccc691467a00d3c67cc1505e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cak/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/cak/firefox-80.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "31c9be88e0263e0968fa2ebba0673234532d6a99d5cf97ab7b863b814d9d140e"; + sha256 = "614876abaaddbca2dd2c56eae7b865828fa446c07bc5401f7bfca7637edb2728"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/cs/firefox-80.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "a606452009ca9e9e7d5f44fc9b42a222e3f557ac4d338c90ab9335dbd96e6683"; + sha256 = "2dafa0635a3192a9049d7804f97beaccf6e62a8613e96ba241dff1728aef840f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cy/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/cy/firefox-80.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "a8254adacb701007945e4cbb48d861358cfefd4f590e509264ecdd4e0e858235"; + sha256 = "1993cd996e6027b4dbc0e306ab8c09772e0013bdbdd2dc9c774a702555b2f21e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/da/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/da/firefox-80.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "350ce9d092799302a8c3830fc756c7ddacc752f9b42e70bd73dc1d61a1d1d07b"; + sha256 = "8fb1663ba5f646cf65593fe6eb57a63f750b555f6c75fad7f4a9d3592bb46421"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/de/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/de/firefox-80.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "576c95fc5aadbaeba43991b2fb28e13cd3f18f2e81e6584a0208328a4f9c5ca6"; + sha256 = "9536de23132d6267f3535e08194679ec16afbcf1c3cf6beaec64cff7de38d701"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/dsb/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/dsb/firefox-80.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "024054a027af7a4e8f68a299ae24a47eaa2ab2e69a847cfaa053295cd454b947"; + sha256 = "277cd59ab97d33a89e621ca3819fea2cc58042cc373891fd4599cdbddbf483ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/el/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/el/firefox-80.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "63ff8a79ec70c7ce44d8375e5ee377754e329f32ad751b87de214707984eba7f"; + sha256 = "609c2e25ab34f793a85e60ff9fec4d4281bdd228026ef698fda1b25e956142ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-CA/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/en-CA/firefox-80.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "eb8597936d2a3a2747827227082743a5b267ee12b45f16e901ab87ad897ae780"; + sha256 = "ca54e8fd35633530605149ca7aba49099098f96e880dd0629885e6c867c3d632"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-GB/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/en-GB/firefox-80.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "8a1b4c0320439cd3ac22b46fc111564b7ed68ba9f04c7b20a276ac550ebd84e6"; + sha256 = "6a6e6b1b34fbaa578a035e430d10fd2911bf64e1917b170cd47ab565ddf9bdbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-US/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/en-US/firefox-80.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "d56bc3d81f7e1807852b326d3f0b00f9e745fe4f8b97c0ffc64aee979db4fa15"; + sha256 = "d87d71827f0161f7d3230217fc4f7c7bdca804ccc5f49b4d107151fbcdd7622b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/eo/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/eo/firefox-80.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "cd979e28dbf2032ed8f1e5c7c84eda3ddefdef4223749b6fd61ef2f727401a4e"; + sha256 = "50f158c96b8de9b789dbc138004646ae583b900fb067b59108ee4ad97e0cd2e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-AR/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-AR/firefox-80.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "4875b4139be6ddcf1e7bff57c3045f29e7730a7bd0e38fffa0443bd0f3aa45a4"; + sha256 = "e5589a3a92ce6ee1b5756beb4cd6903e1526d74d457bf3fffd8b9072ded3c5a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-CL/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-CL/firefox-80.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "68bf54d52e45e0b8e0cfd27ec39e3ff97307e91bcede2f2d2561ac5139d179b8"; + sha256 = "3188fad7ee67a0c98b370ac32a50136c41f69154f99fda13804d16356679a87f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-ES/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-ES/firefox-80.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "e324772591d019b5b27a00716c30ed0f8803dee83276b19b43f5808f584d5000"; + sha256 = "c9f37fa0ab8e4d3c16cbc20ae9ce0f0a568a9cc2c48fbcfa114b1ab2b9b462a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-MX/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-MX/firefox-80.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "bf40f1eec6d42c5706a2ae0f840ec00778801d98476dd6055a7170e8ebe8033a"; + sha256 = "f07ee3d9317157e5205187bffddb0339fb810ff06aeb192d12e367acdfe89592"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/et/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/et/firefox-80.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "d0f45fa9c2e9559efe0376a53d1bfc7fed04a408d563419e283a0e1a4b4f0840"; + sha256 = "01aa2da0ec5504f601e774fb9a35e0b8bcaf59fee1cf8fe33a5d29c05fa75d68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/eu/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/eu/firefox-80.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "def48b817fcd432a3573a1d17bbc4dc8616e8b94366836406cf6341d610ba3aa"; + sha256 = "6d3f10b801660064e8f51fa45bc17bf1fec641cbb526e1da925b8eb71b863112"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fa/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fa/firefox-80.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "08e4e0c50bb80aba30c2f3666cf568c39bd031938a1e2a6b9fd092da688e3b4f"; + sha256 = "0f519bd6d2e8d1e01ef3f6af13937a84fe4c551b56a6c438d01f2b7818c0c440"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ff/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ff/firefox-80.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "3e9e75e5501d2a5d1d1d11e628d6b9acbd613f3a0f7aed005752f4d07f15686d"; + sha256 = "f72bf80190d3bf1a4b81aa06f6f0a7ea25267302747ead42a505461d4cd63e35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fi/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fi/firefox-80.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "61e0d7ee1d4b0d8dfbea3869766497d88dcbf0c467d41d07ea45309d03839a49"; + sha256 = "44aef7c10ed8815634d62bb60b7d5412901dd016ef7439b28a84219546b702b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fr/firefox-80.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "9c502d317ae781e82a69a80c864958ea23eeed18b215b9f08a7ecc024bcc6249"; + sha256 = "a347e36231516c410e756e55fa8e03c660635a70c8315ec14e9b2c68deae9db8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fy-NL/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fy-NL/firefox-80.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "05ed05024ebdb58eb2c178c30da5d0f013299ffbf42c26b7e28c0bd1053106f5"; + sha256 = "d53d4fad373b633e287db03675f89279e44b80c28ab50c238a05b286abb916b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ga-IE/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ga-IE/firefox-80.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "101f512b07c22c24d55fab970b1d5140f6f7a54d470652511e8d053d5d3ba265"; + sha256 = "279f93b6e57dbaa443df2221217e4ef60be015c0a4e6fad8806e97f46f074f9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gd/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gd/firefox-80.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "2a7998045852b8f3bcc86aecf40b5582724da71eb14d1fa612184dacdc751fcc"; + sha256 = "b3c89bb8b8e4f9bae3686e601de8ad7c065940f8852d63a8e503095b0674e931"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gl/firefox-80.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "0aa2c2ca4cdffedc5d17e4223c2cc6e96ce89bc69989ae10be683bcd61f4a143"; + sha256 = "cc9687f4d35a62ba0be5c362bf0d55ed1acdc4d1b4e0284cc4db04553c36786b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gn/firefox-80.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "4e9f93db434ef45712c11ef5e3e812dba5927183d73da81db3b9698f35c51585"; + sha256 = "c3d4cec222d099bd2a9f66c543c97d1c18c0abfa087c19fac3da08579c60d103"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gu-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gu-IN/firefox-80.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f2c3cbef250bfdac654ec2eaf438f51c059521b6a0d1694427013b949a323cdd"; + sha256 = "7af5a56a90bd0eadf93ffeb2b61f08232996b560588fa52d55ffe3023e08b3e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/he/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/he/firefox-80.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "3b4d9dc608998b2d76db3ab2f21826983a12284bffa22e76ec60a275c5a54f97"; + sha256 = "65222595c4df12375837f0994f9fe23a3a8f96fde8ec0d7be980ab16ea19bc71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hi-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hi-IN/firefox-80.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "840ff442beb5c0599f7c67a00adf840a8f4306f2bc6ac8f2397af0b876304741"; + sha256 = "ee52e1eaca1e61c5ee1cfd5e86fc0afed242f9162f36027f57052162b88b2500"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hr/firefox-80.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e0098a3069cb9b86becd2f77a671731bd849a568d2fffb6064528f802e5cd6c6"; + sha256 = "ae9936bd5b55e92250d73859b1d78505fcc3d3312d0772591720012ea820c367"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hsb/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hsb/firefox-80.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "8322028ef47168ecc2928284e0a96d36c9208dfa2a7f3eae6f7449fb77753e62"; + sha256 = "55e837eb12417899dbcab8d15f3c8e3604f7a071339b1f2ee608801ad7fe7912"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hu/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hu/firefox-80.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "801b62419499f9ae9fa48848aafdad7258cc95f7b04b1ade6d3cbf6663a6b3dc"; + sha256 = "710a5e73c34cdc1b7a77e8465724b0e99c4084effb015c3dd71e3fc2f678149c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hy-AM/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hy-AM/firefox-80.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "7b4af441958fbffbf43b7e1ff8e97d62dfd3aef2076bcdf1fb1eda8006093721"; + sha256 = "7e40874e151c69145db6a812d7050de5ea65b8939a394cbc468c3492abd189fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ia/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ia/firefox-80.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "ee2bf28f2cb18a5cdeb51420042d624c40bbaea73e4c567eb801273f0c4c8095"; + sha256 = "5c6083dd765489f378b6855713e601d50ff84acf95674b8d3b873b29981dda99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/id/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/id/firefox-80.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "1083dbcab9b2b297869ef7a4a65ee04b63e851805e7fe7f7977fbe6d2f69828c"; + sha256 = "b8cf9a69b6b52f816e355399e2bf6c1742f56d7d631dbee78a687a1cde9312dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/is/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/is/firefox-80.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "c2c475e280f3f52a134182ac6dc679273c29198605d9214f4ceeb09e57f2cdf5"; + sha256 = "532793a2e2d761ba36a3bdaa0a257e8828b5516193c4cf1f1ec1735efa510e6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/it/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/it/firefox-80.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "d7de926e398e6291e031f737da63fe223c7e4c70c01994bf74c8461e04af0840"; + sha256 = "a5309e5f3c387990ba1aa255684ec73f2e38dca0aa873f998effb7dd7b13e0a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ja/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ja/firefox-80.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "a5f1c6bd8bd5aba351511838c04a35f26aa107ca43d87489ae24bac3831df165"; + sha256 = "f9dc927612114a5c8d9a4e0ee311356a0e5e819729f4ebd08ee5f03dcda52afd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ka/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ka/firefox-80.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "513c9c885f741162301a980daf84eff5aa42f45aaf766a9b3e1376fea83bb78a"; + sha256 = "37b82df19bd4897bc2c29eb3f5f94d107b6b97eeb5a1b3ff5ddcaf641dd0fb19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kab/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/kab/firefox-80.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "15fd46b89f7ea425121d02aef931bbaf624391e7039d81e646d6551303598579"; + sha256 = "1ef2b402c518da26838c2c3e0d5c47fa8f3c5d74cb2f9a95999814476d3bc629"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/kk/firefox-80.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "82a29718fdff57e6d02f8cc6ae76bb604d0e14374e7881c120ff6e38c4b21995"; + sha256 = "d152f45918a163fccc9eec97f5543d8c206a3e9ac130de58260943e6aebb19a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/km/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/km/firefox-80.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "406c361b49d9e5cb6eb952e5be0eea3a8b9ff535a3edb6dc1c60ec6171d5ae49"; + sha256 = "2d9639684b0115f9db6eb73379e1d7b24670db83afd2e7d2bed2a7c62188f54c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/kn/firefox-80.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "0839a7af990a70523355047e5cfd24e73d0c8816cd12f2a21aa8cc244d9ef90c"; + sha256 = "224e41e1c33e60f1de88fe8243742675e0813b7041f1bac3a9a29528c618df3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ko/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ko/firefox-80.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "2ed856441ea51d642027b800911f134c27207dd8a53ee5a27b9674eb11417b05"; + sha256 = "16372732d44159e017875ee9d3bdbc5443bfb1eb577d62e8b28a05560caa2650"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lij/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/lij/firefox-80.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "653c7c4be39dfc49f89e5e6c591ebc953ef0bff5a9d827d348dad26e3f06bcd8"; + sha256 = "a796e32ed17c08499fc2e459a1bf753c7578f5555e0a7eb62757b4c5d4f6b735"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lt/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/lt/firefox-80.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "b61fe55f65029ab661d0b589cc5301c6131b778d55524de6b13779dd2d0d6c35"; + sha256 = "6687e81d9be17a992e34fbbc9f44edb86be75e1329292122e7978211d4c0b43a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lv/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/lv/firefox-80.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "2f9a99d7a344984736cb422ccc106db8d175f31c1b1a108852494b7201ff67cc"; + sha256 = "7c4beca6385caaf9e05eb6f6cf508f51d559094cff3eb60e28d562ec7404d804"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/mk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/mk/firefox-80.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "0cdde250523fbdbb8b651660fccbe1afe65068c263e03fe7ce26d9758fba7bba"; + sha256 = "d8da49d2b43467ef4b29f55a15f71125ceb8388a55ded93ccd90e7d484d84feb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/mr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/mr/firefox-80.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "0df4e48be06d800d1fa308841a1890f7b1c87e63b34901cdd1481a63a7080d24"; + sha256 = "304c8f8caf6ebdd5d928135f7fb94d490658e0fb6b7b73e2f1618b7b07234de2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ms/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ms/firefox-80.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "3fc1dcbe6c72acbee7a68ebf6a8b08b9961a5a04eb05f0cac86ac8fc56953917"; + sha256 = "a4cea6625395d522ab3d4000f6774ba5898a1f740c9b70b23f71f52e1231404d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/my/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/my/firefox-80.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "aba83f9c9f41dc5660a480b6821dff2c405900d9370c3d1414a892ad0e44161a"; + sha256 = "1bbb703f65bc5d41174800ec789066d99ca10430605dfb2975b6d788b41c1220"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nb-NO/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/nb-NO/firefox-80.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "34e9cfa0bd9a065b58edeffffff690abb6240e90f1d788146ac3976d9e7d9cc7"; + sha256 = "95592600fbb71a6346fa42f8647460fed047af96f38754a3322eef9bec7a22aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ne-NP/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ne-NP/firefox-80.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "8031d15b84eb3baa73064ba592434d4d36ae94c6bb3b7c9fa359f93486be3ea8"; + sha256 = "f902008b0c6390265e11209e573555b0854b0d0c879eb5c2637f18ce981223fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/nl/firefox-80.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "33f19d81143a26b7472b70558c2187a4ed39f67ba95e28332c7e8a8699aa33e9"; + sha256 = "9ef3bbe6b6975b50013a951559f6beaa34ddd5b183ccb33500c585e3c094fc05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nn-NO/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/nn-NO/firefox-80.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ca27dd578f8054df63b77c314d3504a2277139cc2d54d43f8c202771ad12e76c"; + sha256 = "783427d27ef6be2bac3a219f72d61a6cc8b6105ec01c94476b06187d83fada90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/oc/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/oc/firefox-80.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "336cfde595de21f8ee355ec4e6a240da8a8946f357a100629ab0d0d883bee335"; + sha256 = "f5a6af6e4d2bee9ea6c8e27edfe593640f0410766eec4a029c7b6641731cca58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pa-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pa-IN/firefox-80.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "bb51ced0f4993862a7d025b1b504e29fb96e6341336c3fc61ffc6d3ffc18d884"; + sha256 = "8d45fd730fcbf898062231356d11892eda44a2dc124444fc0623de363a807a73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pl/firefox-80.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "c44b50bc19b0ba7cb198d144f05b10d5f453c110463dd945534ccd180b71c7d1"; + sha256 = "9c89d3be668a295ef53d1dba84d1b9db230956d5700de6a86a6c8b0dffce5781"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pt-BR/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pt-BR/firefox-80.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "6cda521f9c8a02c948dd1461fafff84e7e1b793815b6f25697a78751264dc689"; + sha256 = "8c591df0daa36ce3fd8380d34609cd1e1d26c8116db5bbe22828820c1f7f84aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pt-PT/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pt-PT/firefox-80.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "56e5ced26db5466aebcd7108dc3f499b243631bf61505a1fffb92b2eeb2cb5cc"; + sha256 = "e3ea46565734355a779e5b4b083c14e2f13d14f78f7347c36306fce57f4beb16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/rm/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/rm/firefox-80.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "47913299e22f8b955bd5307241d368cb3c29d6a0bb0d90d5ed7667b85b6aa0e3"; + sha256 = "c2355ccb07cd804aae65b31270e51d2d0a1ea438db44ab75c22aa57cb1bec71a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ro/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ro/firefox-80.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "528c36c4361f42a3d90f076800b0b73c8c1d630ae97ba33ff59e72d30d203cab"; + sha256 = "e7b729a18283dabd9f295a436e97c3bd42eb6666e77c42ef1b967598d6e0ae37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ru/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ru/firefox-80.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "ff1a33da0bd8bb7c2d7f460724c292b7433087ba5596258cc4bbbac2087d81b7"; + sha256 = "d9b2a3449ca0ed738db8bbd3f316a4973fa318c4abdb63aced9832419b579229"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/si/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/si/firefox-80.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "675d6238f6bcf07751ec5356f3f4824d681ef28ac26255e1bae84cdab23ac0a7"; + sha256 = "8a43a0b25befbb5f0a9477086ae85d58b1d4c448e06630d1c0ece950d24bb6a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sk/firefox-80.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "141416a2320bf355cf9f3ca33ec3983b5089c5b2c9172cf03e00d21577b570c9"; + sha256 = "40a4e4b307ebea63a13e8073536c1d039ee400b4eff109a4ed086c5f073c12bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sl/firefox-80.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "6d062305ad9e40add4f8c84d051647df8c6b3e083011e00d9380f3e2eb6f128b"; + sha256 = "19b163d77a8480099cc356f84c00d51c62cf97095ed2a3f2a16a654abcc0d413"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/son/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/son/firefox-80.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "2e2adcfe7f26adac4aa820acbe894fa567f53faf2854eca3febf2d7fb66c97ee"; + sha256 = "0c9b0546846cde59fc550f2a94abb8e909f1955ff5790aacd3bfdf63a668a1d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sq/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sq/firefox-80.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "eeddc2cb86011cbec49ace8c954ae9724ebb9a800cacd4354cfbee782ce7e481"; + sha256 = "b153afd0d8efcb4563bf46df1f8d20408e179ecd94a4e294683eb5caa0141228"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sr/firefox-80.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "88081a8c78e039aca0774b1ad61eb3508b9d4bf088cfd27e6b420431dcc6b95a"; + sha256 = "36a3dbe8a9fec700ab91134344db6d70dfe96d53bfcf366ac83b29ba7f405a35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sv-SE/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sv-SE/firefox-80.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "51096fc91f7bd36b6bf66c57eb870cfbc62c42880ef2b7d3ae8032c49b5dc07d"; + sha256 = "708b43a83fc88ddec15a87a0f753690048dcb7500aee2a52c59c28912de5f401"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ta/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ta/firefox-80.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "06f1af1fff1eff74d3aee7a7bffc7485911d350daf216bc8a3f6462b85ab28e7"; + sha256 = "e552b1ff45f4b904a7b76af41f44e9e349cf08f20981f44b95d7e89f727d3c12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/te/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/te/firefox-80.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "5921702973c5c808f396fad81e736ffe7b9948996997cde5f721e55a6b0c172b"; + sha256 = "5ea5d027d0b6aacec730a865d8c70e8929c858b26a3ca0f798bb3a405e438aa6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/th/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/th/firefox-80.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "5e8ff4f8b3204ed67545c4c68cc225ef7e28ce9c63108efdfb1ced7c77e2ce6e"; + sha256 = "32e0e810308c3fdb52b247d086193f0dbf1184ee2f6ac42c2a25766f158ed79c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/tl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/tl/firefox-80.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "72b9a9cef7a4d166e9d33e0a89d00a1c270d1e6b4e5039356f6145bab0d8f6a0"; + sha256 = "d64ff747faf81f626ff91c18f72f786669f48ca84f55df58a25ffeadc1683325"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/tr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/tr/firefox-80.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "38cc4e45e3222633b7f85c59eb1fc8a993f4b77ffe9b50478ae894fb68f67304"; + sha256 = "22cfc8b33829476e0a058900f5a606020b249225e15c3a78a5baa314ea39a5eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/trs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/trs/firefox-80.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "f82d215f8a1a9b5b07ab71cadf75ef007e57b987d025c14fa671305dc5087182"; + sha256 = "a7db4c7fc442156414d658b04cb531fe5b4f4ac7b46e3a62229bb7528b40a43d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/uk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/uk/firefox-80.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "014d024f4d14f465393f096147b661919dc1793289e68c4d13b6b01dba42d4d7"; + sha256 = "072b4d82b5a8c14764f3664ea5fd436aa616984e044e078002ef6c4ab3f5a804"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ur/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ur/firefox-80.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "c2b7382f1e511dd7c79b3d5854059c403f633ec4423ec31dd9395d6dca4d31ee"; + sha256 = "c52f5cb761b5d8f7c6c3646c3fc2a5c4580d5dcaa0d8757f3f37b990a1b61191"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/uz/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/uz/firefox-80.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "66e35eb3fe6aef2a3d4986a585072f96b55877b0a15ce81c41096e1f1c001f2a"; + sha256 = "4bc2ca5751a9d0cd69661799ab5ca6725bdc12055d07c975a6a7f90f44d93182"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/vi/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/vi/firefox-80.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "d1cdb32bfb6f6d8e41d3f32de0c86654660d5d7ca4bfe0e763eeb799c0ead10f"; + sha256 = "1ce68d3b630754f961264558c424c0c9771d77f01858570ef0d15ed2098e99c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/xh/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xh/firefox-80.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "508d17ec13f5b3e1d18641451374efb72331fe68b254f8a71bef4807c318bb9e"; + sha256 = "b7e4d8f55c8ff78491cf2e65510397f09b3b5995f7f7fd506c7e20027d330ee5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/zh-CN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/zh-CN/firefox-80.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "cf2f5617c652209daef0e6e5176181f2659e188f9007d7accb4041c030c54fad"; + sha256 = "3ab8f24ea6809b9a2b1cbecef55caa39dbf4ecd33b287b8ef77e5a76bb617337"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/zh-TW/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/zh-TW/firefox-80.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ec99c9201151f134d72450513c518816f244fec0af6de2bb4ee08d3286b709f1"; + sha256 = "4c306d3227ca8dc322780c0eeb8532a62db101c6cde8317acfa824bdddea4d12"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 2fc15a42a8b..1f1831d3c91 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -141,6 +141,14 @@ stdenv.mkDerivation ({ postPatch = '' rm -rf obj-x86_64-pc-linux-gnu + '' + lib.optionalString (lib.versionAtLeast ffversion "80") '' + substituteInPlace dom/system/IOUtils.h \ + --replace '#include "nspr/prio.h"' '#include "prio.h"' + + substituteInPlace dom/system/IOUtils.cpp \ + --replace '#include "nspr/prio.h"' '#include "prio.h"' \ + --replace '#include "nspr/private/pprio.h"' '#include "private/pprio.h"' \ + --replace '#include "nspr/prtypes.h"' '#include "prtypes.h"' ''; nativeBuildInputs = diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 62181321cac..ce9365f72fe 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "79.0"; + ffversion = "80.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0zgf7wdcz992a4dy1rj0ax0k65an7h9p9iihka3jy4jd7w4g2d0x4mxz5iqn2y26hmgnkvjb921zh28biikahgygqja3z2pcx26ic0r"; + sha512 = "3rw30gs1wvd6m2sgsp1wm29rrbkxyf3jsdy8i0azfz9w7hqcfwnv76j3cdf18xghh954hpn3q6w1hr7pgab3z9zjxzyfcnh2mbabyvc"; }; patches = [ @@ -35,10 +35,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.1.0esr"; + ffversion = "78.2.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "223v796vjsvgs3yw442c8qbsbh43l1aniial05rl70hx44rh9sg108ripj8q83p5l9m0sp67x6ixd2xvifizv6461a1zra1rvbb1caa"; + sha512 = "1dnvr9nyvnv5dkpnjnadff38lf9r7g37gk401c1i22d661ib5xj0gm2rnz1rjyrkvzrnr6p9f7liy3i41varja00g0x1racccj1my9q"; }; patches = [ @@ -63,10 +63,10 @@ rec { firefox-esr-68 = (common rec { pname = "firefox-esr"; - ffversion = "68.11.0esr"; + ffversion = "68.12.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0zg41jnbnpsa07xaizwfsmfav0cgxdqnh8i4yanxy49a45gigk895zqrx2if7pfsmdnj9zpwj9prj8cpnpsfhv6p62f3g2596aa9kvx"; + sha512 = "169y4prlb4mi31jciz89kp35rpb1p2gxrk93qkwfzdk4imi9hk8mi2yvxknpr0rni3bn2x0zgrrc6ccr8swv5895sqvv1sc5r1056w3"; }; patches = [ diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 252a6f5b48b..96767f63653 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2020.5.1"; + version = "2020.6.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "0r1n3a8h8gyww4p2amb24jmp8zkyxy1ava3nbqgwlfjr3zagga00"; + sha256 = "09jdgpglm4v7pivx8016zzdvj0xkdhaa8xl71p2akc2jn8i8i6gb"; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 282890ada5b..d751c8ca18e 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -3,8 +3,8 @@ let goPackagePath = "k8s.io/kops"; - generic = { version, sha256, ...}@attrs: - let attrs' = builtins.removeAttrs attrs ["version" "sha256"] ; in + generic = { version, sha256, rev ? version, ...}@attrs: + let attrs' = builtins.removeAttrs attrs ["version" "sha256" "rev"] ; in buildGoPackage { pname = "kops"; inherit version; @@ -12,7 +12,7 @@ let inherit goPackagePath; src = fetchFromGitHub { - rev = version; + rev = rev; owner = "kubernetes"; repo = "kops"; inherit sha256; @@ -51,11 +51,6 @@ in rec { mkKops = generic; - kops_1_15 = mkKops { - version = "1.15.3"; - sha256 = "0pzgrsl61nw8pm3s032lj020fw13x3fpzlj7lknsnd581f0gg4df"; - }; - kops_1_16 = mkKops { version = "1.16.4"; sha256 = "0qi80hzd5wc8vn3y0wsckd7pq09xcshpzvcr7rl5zd4akxb0wl3f"; @@ -65,4 +60,10 @@ in rec { version = "1.17.1"; sha256 = "1km6nwanmhfx8rl1wp445z9ib50jr2f86rd92vilm3q4rs9kig1h"; }; + + kops_1_18 = mkKops rec { + version = "1.18.0"; + sha256 = "16zbjxxv08j31y7lhkqx2bnx0pc3r0vpfrlhdjs26z22p5rc4rrh"; + rev = "v${version}"; + }; } diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index b852eb02fec..977b71ebc50 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -4,14 +4,14 @@ with pythonPackages; buildPythonApplication rec { pname = "rss2email"; - version = "3.12.1"; + version = "3.12.2"; propagatedBuildInputs = [ feedparser html2text ]; checkInputs = [ beautifulsoup4 ]; src = fetchurl { url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz"; - sha256 = "0zqpibh31rl6xlfw9y66d9hfhwrnzy5cjzbksczyw3lh4dfzsql0"; + sha256 = "12w6x80wsw6xm17fxyymnl45aavsagg932zw621wcjz154vjghjr"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index ec4778cd4ab..0b18a579e3b 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "1.14.6"; + version = "1.14.7"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0i0q6vwhnb1grimsrpmz8maw255rh9k0laijzxkry6xqa80jm5s7"; + sha256 = "0r58xnjgkw0kmnnzhb32mk5gkkani5kbi5krybpbag156fqhgxg4"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix index e0f75692d26..c48a6d1c606 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix @@ -1,615 +1,615 @@ { - version = "68.11.0"; + version = "68.12.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ar/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ar/thunderbird-68.12.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "878336931005573f76fb15c25fcf2593bfabde16356ec6b1f9b8913663b5fcaa"; + sha256 = "70cfb9e6a7a1f285f37a8f13c9a010237e6aabf815b77a12f54ee0deedd36400"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ast/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ast/thunderbird-68.12.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "5e3f29fb47ccb059d983946d6efec14b8ab00695fdd84a5cc7baa0cc40657cc5"; + sha256 = "5645657f20d37ffdb11f383f164f03c66ed2024244849b09bfa60075d5d07490"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/be/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/be/thunderbird-68.12.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "5cd4c3a3d6ac865b727b58cbb51def60779c0d731a9f6b8f01d4b8cdc90d42b5"; + sha256 = "d38cdcc2ba4534c23a1bb42b93f271623c497f48e1d255a23bf12a368ff339bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/bg/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/bg/thunderbird-68.12.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "f359cf1bd12f14bd6636fdb0bd885ed829235559c20c86bd361668f057039f34"; + sha256 = "c8883242683dec57f9db502d96d2036ec46753f474a33c0f1ae31f97f2c3113c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/br/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/br/thunderbird-68.12.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "6cfc9608b392b1e604eaefda5a5dcdc346bd88a1bc411532e8864a04631cf6f8"; + sha256 = "cfb669e2378f97689a14f23e2c55ef4987e2508695eb195be3af75ed1d648345"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ca/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ca/thunderbird-68.12.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "9068b49e2d8a6f5e82b70ddda1b0a048d094328c96cf21848eefa431d358e6ca"; + sha256 = "9ae4b43e0d5d9edd83291f0be7d53d07e5c84f1d0ad4348654136543b7b53a54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/cak/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/cak/thunderbird-68.12.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b3aef7c88302e2b9d0fcff8daa0d8ad4e2893d41e54ec29b746e79d5b03128b2"; + sha256 = "d6d635a15b913679ed943c3501dd03140d099ff36b48c8731a47eacda1b5232b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/cs/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/cs/thunderbird-68.12.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "a2338c8ac38a4cef41d8fab1e7857c290afa30af0b131a31e675368944d69ba9"; + sha256 = "616fbf24e36d63ce3cbc957d69b8972d517524c613a22bedcf5b57534f9a9a41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/cy/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/cy/thunderbird-68.12.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "b02118f945ee76653df0364da6b2b8c597fff2bf52f4e20b64f2b8ac69aaf60a"; + sha256 = "548c51228d2f3003bb94e1bee91cea0d2edb95bd0f86ee4259c8daef90a2dca8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/da/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/da/thunderbird-68.12.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "a565beeaf67c01edf83a2478732fa9e245645d6e6b4fb566affe552762b8bc86"; + sha256 = "ad0e4b7a693d881b8875a5b8cc3e607a3883df759278129f0933522b9a6acd24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/de/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/de/thunderbird-68.12.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "00a8f51254b2152ba37d964bfaca77cc06b9d778ef750eb6500e01510e298fb4"; + sha256 = "bf9b70b345ffe5df03365d819c5abc3339ed3af4d8a716cdfe7099134864a9b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/dsb/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/dsb/thunderbird-68.12.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "7cfcafbf7f46a4be23003a59390b0404d04ee344c883c29a18f42accb5fddc4c"; + sha256 = "a2cd7ffb0e8b4c3d1715c18e636d0dcd5efa245200d6d0f14048fc4b399b8121"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/el/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/el/thunderbird-68.12.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b0d0865f8b64de26af8eeff6eb84f159f585e3f9f7590dab413e04167215dcf3"; + sha256 = "07836ce122936848e26cd5a1522967760bee67654582076c53e4ec183cc4c40e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/en-GB/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/en-GB/thunderbird-68.12.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "eb6731a9baaa1cd99584aec7c6dcce8f819d41106ac6ed4f42f02f747cb2afe4"; + sha256 = "c89fa35af79eca3cc26b492c602a3f8af0dbaf6ce4ee3af93d93f10daf4e9d6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/en-US/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/en-US/thunderbird-68.12.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6ddd72732957282280a7209f2d5137229ca8af4ad7f02e112187fe333cc79a7f"; + sha256 = "6eeea0de838909f91da7270e42ae1513d2b801f412fc758f2f8c682d260a7c24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/es-AR/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/es-AR/thunderbird-68.12.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "0d620d929ed41ffd16cfd8297ec70e8cb9105e726af99d2cd207de50920a1f93"; + sha256 = "e9d84032a91f7feb2db3d22a500c564f273c2b637f97aaab2edf3209b93dda1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/es-ES/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/es-ES/thunderbird-68.12.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "28bac94492c7444caab029f3cc3995275000496aab854f20368f941514cd7b11"; + sha256 = "a986e8a48b59354421193f2dd01e3c291fb6c98031af43531e723dc217a43d4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/et/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/et/thunderbird-68.12.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "49fe0adb4fc5c5135083ba53369030faa95d3a530e8eb49180f81e359229bf81"; + sha256 = "2f7508e83aba4fd64a817c7eb4b44d4ea9371956339a009ba541bf3a349693cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/eu/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/eu/thunderbird-68.12.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "a422935f96d5a3033c6c2a7bd39f19e3f84211d99b57d3996b31e404414703e4"; + sha256 = "edbc5ff4ba45106233cdbf5255405c4ee52ba7e6811736958323a616881b943f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/fi/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/fi/thunderbird-68.12.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "649c3908ecccc8466e555aa76aac47bf7153da8b6f45ddf83f36f6ac676cb4c3"; + sha256 = "f4ad740a724efdbfec54445304ca75e9a16e0881bc18789b8ea35632d8857d4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/fr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/fr/thunderbird-68.12.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "8270cf0e0acfb7280b8616462cd87a1d8d929c7c5fd4839f9607cb588a97c025"; + sha256 = "ebf60a227c9fe5237eff22fb81f3c8bc02a593de823d6f0ad9b67f07af129dea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/fy-NL/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/fy-NL/thunderbird-68.12.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "177a9f337719b2902ae964525803cd437b2cbcc8c7b85c7881e14f7e0d207875"; + sha256 = "b12983077a62c5bf7353f50dd951348a457ce07f5beb2a579f199c4d77ed0906"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ga-IE/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ga-IE/thunderbird-68.12.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "80d3625a04d027382ec3fdfdabd45d501fa4b451c82ec5cfdf5c3352a395a6ba"; + sha256 = "aa7c3a4b54fd6fef0f120a6748c45a3f379268f31e087cb3df07d270bf060bad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/gd/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/gd/thunderbird-68.12.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "0b2fc2582ef518529f204b5096601047b5b3406201b1fc9f7ea88736d1ce1e0a"; + sha256 = "39fadb2bd4c01da0eb188cb9f52ccd726ec9f7eb5ced44e2a30ee0cfac2527bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/gl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/gl/thunderbird-68.12.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "d1cfc4e646fa6ce03765a56ea4cc2ad3936ec8224f1a7f5e74a34c189be11721"; + sha256 = "b4ee1f89b0326b22fc7a5b980b857c2652d6881d096060a8bc083015b47762d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/he/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/he/thunderbird-68.12.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "588f22ff9dd4dea7c808c4786f2c897842dedbf2a04c0b4d28b3aa162f88773c"; + sha256 = "cefbc742672942e310dc9f4dbcefc8b66cf01d58ac64448ac8c0dc33fdace5ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hr/thunderbird-68.12.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "126ae387a1c97d253c4ca60441a192d6a00f63f0483b2888371624337e4fd2a9"; + sha256 = "9e132811cb6bd98faee86e298b78e845727bfded84c0cdab41608ed1565f1aee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hsb/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hsb/thunderbird-68.12.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "456c323f61f77c07ae73a260a3ad2641190f165d14c75da1dba33ed1f8d2a3d5"; + sha256 = "2a41d1e188fd5fed93a37a1bedc67cb745367447504a76836f79928194730d3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hu/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hu/thunderbird-68.12.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "4790f014d95fe3ae00433e27fa291f7e4657b8062538ca52c46dd46ea41a05cb"; + sha256 = "9196df7850b9cff69f52b5db69ec3b64cfa312bba5669380c137b95a8140cf39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hy-AM/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hy-AM/thunderbird-68.12.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "7d81493a67e27eb485c1cb702cb8305788733e133bcb22659026737cc2afe1e9"; + sha256 = "4a08137a9a714677ecf86a24f165047b809e22eff50d196b92c153e59f943c30"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/id/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/id/thunderbird-68.12.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "9f558c85ba88c6350da0445ca2d2b63205c8c1e6700388e1d4f7de0978321667"; + sha256 = "39784aab0bc3253af47cdcd95824eccdecae4dac819bacf6a04daa7b5c86d6e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/is/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/is/thunderbird-68.12.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "1f1f65bb573fb4fb563e890c043ff8c3283687575892853dd3e076473072b63f"; + sha256 = "a041d1af23e9c64967e4d014b6a84ddc80ad24e852146e448f6b380cdd672e67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/it/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/it/thunderbird-68.12.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "de6c3adf83745370241c8935edccc412a60642ec758bd891d03c098b40b8792f"; + sha256 = "b0e3161c801fbaee2f589b1bc61a4fba9968f5f363a62cf0f8af855d23e4782c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ja/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ja/thunderbird-68.12.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "8b2ce4598af7323f59a31269c24bd05e369d9898266dc6e8cfa360dae7609273"; + sha256 = "ad416d47930d81be9ac2f20b3699f4c74471c36e08b14f9d5c6ee1af97c7c9d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ka/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ka/thunderbird-68.12.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "be74a3edf9a1d931124c4351b51147be2e7a74f453d07482bce4f7721de701ce"; + sha256 = "3b30bc5f0971310d71e1909b4ed891481457ac8baf11c1e505c3400b2a7cfb63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/kab/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/kab/thunderbird-68.12.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "1be81ab7bb429b44e0c63c81ebf249b66a79d43a3dba39ba0af6242db165d6d3"; + sha256 = "abdc58d5d5ef251e63c0c40a48460f90e299a4420cbe4e290d519fbed4c335b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/kk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/kk/thunderbird-68.12.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "ee308381b1e0643b7e0683c365c763beb4afcaf21c9b0a1e8c8c2ec3c218c965"; + sha256 = "08018b951de59b1a92717fc82bd98a0c324a019ee0ae14888f09c5351a586284"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ko/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ko/thunderbird-68.12.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "af2d7ee49a6295e41dbfcc7b8e19b8f146890f12baa36ffddbc7dfbfa39a8eb3"; + sha256 = "1178adc42b3a2ddac46dd50ad8436d1be50db409963e8fac3beb22a431f885fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/lt/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/lt/thunderbird-68.12.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "8d384844274d048772fbc35da75f91ab6398ca64e26f089c4da116065584acf1"; + sha256 = "18d88a8cbb24d2a78af0de282187a743e707136fdb61912e5f64bf75730e3a76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ms/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ms/thunderbird-68.12.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "6e447b3ed1903a20001963021598d957270c88980ff04d3da6c819ab106a2210"; + sha256 = "e1754cfbf20e286fd6304b8d75337e3794893c5ebd9b242cf624090e6fc6e9ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/nb-NO/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/nb-NO/thunderbird-68.12.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "710a982216120cbec822d7a9f74d8ae789b4a234fb3a192797604c9a47a23a62"; + sha256 = "6379f6dca3d8bacb466044f0a7d11b32eb61166d3f14c37431f77843eb884c90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/nl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/nl/thunderbird-68.12.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "2b02b7e3b5e310e5b7935cb72e59d6a385567100d22e87d196c4b4700851d439"; + sha256 = "66a56e218365bb260980848427609d390674e2ba3c70b9adc4121f73c861d9b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/nn-NO/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/nn-NO/thunderbird-68.12.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "128807f651cc0b09618bad42703970c391c17f5ff883c3ab11d115d0878fe1aa"; + sha256 = "ccdb135d43f5542151fe2c99a8e13cebfbc032367abb0308213433b753dc8125"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/pl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/pl/thunderbird-68.12.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "181721ac04e9911f57ec7b4f36a5db82e261da71a310dc502efab75a101bec03"; + sha256 = "5dc2151d1bb956c4b6fbd1b6185d9328f7091e60fdcd51bad5a9ebaa8fcbb7d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/pt-BR/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/pt-BR/thunderbird-68.12.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "e82f40343e28ecd0abafb71f421c6d7df40b7cfca4898503b32fb0500686d7c4"; + sha256 = "5ebf77d47bf45b058aaeca857060c908dbf7036bae2c2c5812ff145aed840203"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/pt-PT/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/pt-PT/thunderbird-68.12.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "96bea893919ff89441dd47e027a7d83aa691cc99abf4eaa342c941777ecf319a"; + sha256 = "73baa68f79b4a15795fc426dfc9a8d573a05e4ab8a663d122cfd802f93941825"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/rm/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/rm/thunderbird-68.12.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "544f666af94043737503a30551ad5832f22ae529bc32495bef9d7443c8869072"; + sha256 = "29f8ba57d9000803bae795c2ff977347af9a1f0df123337eaab3bdcc20786734"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ro/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ro/thunderbird-68.12.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "4c6e7793c206999e0a9510b390e4b47d82e19dc2da1cae8b4341b8afee440191"; + sha256 = "b8233ad81c6620c26a02457b9235ce0be0c5d93b81f88d9ddc84bc12f869dbad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ru/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ru/thunderbird-68.12.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "66e951339323a3a44326cada8c572d7040d33057a3a487d8078eb27efa791eb8"; + sha256 = "f959f786dbbb7d06cb33eca24efd9e2763c5ca73fc4ba47e9b933b6298d7f026"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/si/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/si/thunderbird-68.12.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "3ef89e462359d09d95216a132c462f0529948073a4f0aef6358362d0457e747e"; + sha256 = "dcf59c0c1ea0acdcc894463b04c54339a72dcceb25fe5478608265eb3ead226a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sk/thunderbird-68.12.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "476641e4d45cd114dca94f59ddee15fda5fbd432c50e4f29af09eb3298782854"; + sha256 = "2a06329fd4a9dd6333e2d73a44fca7eaf593032e8ace33736a03dbfffb2920a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sl/thunderbird-68.12.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "5e85ff37554f47f585a155db65ae9e782c8604fa44db8d0dc9c3e2741704909d"; + sha256 = "f7bd3e3a407dbab07836342ff29fc143fe3904e7f878ea719522ade3fc4f6b84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sq/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sq/thunderbird-68.12.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "fc4f839973d6986979089c1dcc1e9b219007c34ecd2d587538db706e4b01eccd"; + sha256 = "0edc58751a6794494efab8b0a2ce852374a747ccb73b38455475f0099ea0f238"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sr/thunderbird-68.12.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "85a32f352d2b535366dd10a49116e65de4c8ec87886b37e34ac55082c4c310fd"; + sha256 = "91ac5cc0646c062b00b3b064af53ba03c7e034b75afa13dca7586eb80578d377"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sv-SE/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sv-SE/thunderbird-68.12.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "19af3a847c9e28baed2db8f6b025dcfb0e688932b0483bae461c86861bfa67ea"; + sha256 = "5aa21e4b78f4294835197f784a651f17453d83fce98e7140e49c6da117464fd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/tr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/tr/thunderbird-68.12.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "deea2513814df3e7a9004316dc50f6fa2bac46e0d9456cf124e33e6e03a9b4c8"; + sha256 = "3ab2639dd126e3ed9b031fc10f4396c7d98ffa7b7ffca6a9b3f2f47590e3b83c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/uk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/uk/thunderbird-68.12.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "22b34b43ccc74eb2dc565a0c63bde89ff0d22f710bd26868341be91f51489f94"; + sha256 = "59be2ddc7c65405e0b3854c2a551dab73df9736842ee362b2a20dc9088242a96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/uz/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/uz/thunderbird-68.12.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "26bb8336c617dc6fe485339b3c8da814f7aa0b46eb0a821db36309305ea87e58"; + sha256 = "ae196683b283525511fbd2e3ad428339672f2f1339566a323e01f6f649d333c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/vi/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/vi/thunderbird-68.12.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "88705691ae084991c198865f1e93d1ed127496245313cb8f28dafac0a64793a5"; + sha256 = "9d66b8e4eefbb6b8c0d9893b056fc684310ae583921d626cb676cd8a7b4b39de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/zh-CN/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/zh-CN/thunderbird-68.12.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "5ebf1ad54acb6d6d17985d80bff9a0b39726d1f62eea30ad9ca0f04577f640a1"; + sha256 = "2839f2f076a8a6e283a3ffdd6100986a11d19b9108fce074f8e7f127cb0f375e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/zh-TW/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/zh-TW/thunderbird-68.12.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "b795b0127cf922f65a2ad2d8f17ebe64089c6d06fe7a701c289b7af5afe7c371"; + sha256 = "02ef645a7de8abc1c5dd92eb685d64570cf1db971cfe7e248111d6a17b3ddcd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ar/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ar/thunderbird-68.12.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "d19d082b55d76862977b9357e9cf245697c24d207a6d6b3aacd81abf1443747b"; + sha256 = "5c4d899245a38626fa18d849bcf01d50125dee60d715d76224ca0bb4623f73be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ast/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ast/thunderbird-68.12.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "6cd6c484888fe96fb08eab2b6b2a4dc8495823efee6a373536c26e9679fc664e"; + sha256 = "f657bdc5b43b75e43578251abccf5c7b9e6d0848fd55c6105060daba33c36721"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/be/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/be/thunderbird-68.12.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "bdd2ac4571d6444ff9a3ffd72c1b55cf5f564c740b5ceafce7a2e2268f482dda"; + sha256 = "669a2cbfe600727b9d9a8ed5046272a1f19b80b6af9a6a6977ce1b89f60fa36e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/bg/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/bg/thunderbird-68.12.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "3354c7e4b505e99a53a10cdbeac5b6425b13182def27a82c839eaee6ba6e2f86"; + sha256 = "e1b33857544c10c0191316f6e3d16b34957196b35a922c884315714fe851389b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/br/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/br/thunderbird-68.12.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "27339c12c5cdabea7a9a057cad70fa02cf4f69860e71b604f81a60f891345268"; + sha256 = "b9e4a530529449446fe5a302277878c4d2192ef7bb48206f8528024087f520ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ca/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ca/thunderbird-68.12.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "b65b6d20d7251795e0a9f0ce88f8133d7742c6361375e4897a0bb2e043dd8c97"; + sha256 = "aa5e4ae20fa9e5dbb8c0ba275ba18d1ba94900094ba3186aac40ffb27396a96f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/cak/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/cak/thunderbird-68.12.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "173a85565dfb7b9d44b5757245f8b5f8a62fd15a8a15bfee0680a96ef8f84625"; + sha256 = "a812c9150feec48e2ebfb1786f5e30ade33203160fa4102382435641caeaf3b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/cs/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/cs/thunderbird-68.12.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9cb5def4eca0bb103516a66f90baf91f7b4e962d5ed59b4f09ae9f19e7f95b47"; + sha256 = "75813ad7dd0ae5c073964296dd687e5c1289178491adc98d40e853ed812bdca9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/cy/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/cy/thunderbird-68.12.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "8b51e01daf38091d3b1b32a249f3c6fb220ad8075bbfd16914cb72b24435d8bb"; + sha256 = "b3894f05cf905aa96612860dcef0bdb4bb9564901ef84172e11856a9fa9e0ca4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/da/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/da/thunderbird-68.12.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "1269600ab71c691563482c6d5787a7670fdceeda3a07c61d7cf2477aa16fe075"; + sha256 = "a4f21bd2017043872a962167f98db358b824ae1821fcf03e2df1bef7783e07c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/de/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/de/thunderbird-68.12.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "46c5fcae1b11b7e31fff2e70397a560c502bb3360ed646dd09945fcee81efad7"; + sha256 = "3a079685f75d2ec0320ec9e366b4e037954d67fa3f9e3bda055b8cd7de8fbdd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/dsb/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/dsb/thunderbird-68.12.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "4dc661243d99edb84d0bafd45300bf18d86d5289ede3db066ff89cc4094afed1"; + sha256 = "295a0f56429b3638dd0dcbf8d97a6376636b67e22d493ce8dfaceeb579466d18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/el/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/el/thunderbird-68.12.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "efd5f7f46d53bf34146a6f39149abb2aed9c47b735339cf767e32e6387ba50bb"; + sha256 = "86e4b98ede80cc07cc1aec043af82068a73b7c76820f70df8314e3b91c108d18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/en-GB/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/en-GB/thunderbird-68.12.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "ce97a84ba103a7e5bedba43ee47a5c603c1b5d9bf3bc1a8cab4c26ec9ace21c7"; + sha256 = "2cb03a17f88e3826181911ec6a7455528d1e4c051b065252c964c6c0794175e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/en-US/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/en-US/thunderbird-68.12.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "632f078407322995eef93db134f1da753a1b35696a668a5b8be29f908a34c223"; + sha256 = "11fe953ede0d99656534ac676f118e939024744c5301d378acbeac6792e668e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/es-AR/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/es-AR/thunderbird-68.12.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "88b67f07b6069adcb82c04f818493e25bd145b5d874a7503453e88ea14200499"; + sha256 = "596264396a25adb873320222697e7f1a58aaab484de9c0d2e85f99962b6d893d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/es-ES/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/es-ES/thunderbird-68.12.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a52a6917d77364e5f7ed06f4484abf7e607c53445ff338e65af6b9bad4626e0d"; + sha256 = "a9512af30e2b1613a6bd1ae6f4ce785f676b2cf70b80a37d85a5e1566bb2b35f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/et/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/et/thunderbird-68.12.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "a0c15f0000a00984760419e6f737840b4637bf5aa014ee88093aa2a7a3258807"; + sha256 = "b7dcb196881a23e979edb5ae247a7c07b1cf1250cb4c159ce523d1a26be188c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/eu/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/eu/thunderbird-68.12.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "d69e9af1a381743acc9ee1f800999b015129cba4fc112f312a04884c121535b0"; + sha256 = "4066164b4c9242a9885bc2de802c4f5b6b594c928db36ac72c94faabaad86679"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/fi/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/fi/thunderbird-68.12.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "876673de48a047d75e0ac766dca338629069af1872308a7bc6a7e068da026d3a"; + sha256 = "a7c635cbbbc10725b28052ccc61603fb60b91e06bbf1f240561bdb8f941af55a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/fr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/fr/thunderbird-68.12.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "d83d87dca716d4cd3850df1c5923e88f15e35354abc874202c8c12bf8d1a006f"; + sha256 = "7dba28adb1287e1aa9ae85840fc3aca42aaedd4b2c2aa6cc68d5f793549d19b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/fy-NL/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/fy-NL/thunderbird-68.12.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "0cce3392aaace190f9ea0247d89699f73d534762278f4776146a1f75bbc09996"; + sha256 = "bd763e264eb684ec3b0b1f2c68ce295d1df86994d15f5c66c487e4742bfef86e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ga-IE/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ga-IE/thunderbird-68.12.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "83b7e660e8098718bd4b205ad2de53522bd94e7a602afb960b6381fe4c11a395"; + sha256 = "52f9b5694efbdd8ecc76aef58695423c6a4b547b5b0cfedca313386b7500685e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/gd/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/gd/thunderbird-68.12.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "447a887ef76e57b9c12a0991d7eaf903ce29d7621d4f9143edd18b56bdab81d3"; + sha256 = "6c9c1b0f11ad13e0780371d54fedb52d2463713db3bc52adb72c8ea9ff80eb8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/gl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/gl/thunderbird-68.12.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "288b865596e2b8b1087cbca98bd9c55f9aff1f1cb8d432953d20854b0b1e9ab8"; + sha256 = "608bf5c0d6148cc3014758829ba06135222b462242456ca0984e7dc12654c2cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/he/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/he/thunderbird-68.12.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "9d801a18324849e4a6faf3266c09eb5898c8122e89b020e35ea25a6b3899a4d2"; + sha256 = "f92d569a53f34bfdda4dac185834e5692526f13f20853d1943f165af33b54a37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hr/thunderbird-68.12.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f20210372b36b43cdae8f7f1294927dfb364d1ca4db21ee8af1c059a06f3e45e"; + sha256 = "60d2f184219f8d17c2739ee3cc8463bed474142bd2caad74157b97db2306b27f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hsb/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hsb/thunderbird-68.12.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "54daf67c97f2e7496fabe6bef2d1d9a60baccfee35d7331444d48fc6fe675c26"; + sha256 = "40ffece26101b2f6a7789511b026d99234bd34ec78e566e7e25065ae3201d693"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hu/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hu/thunderbird-68.12.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "0791aa7bec49ff1bfe862f9114ed4b0013361f2f1fa0e4745ad49c8c0e0a9f84"; + sha256 = "e74da0bdb27fe3375dfbd1ab042892de3ded84f33a6f6d46e209fdcaa28183d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hy-AM/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hy-AM/thunderbird-68.12.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e64bacff30d0b2b2a5038aa11d719c9ef3124d64b9923d52a9c5856f6584f9c2"; + sha256 = "fd93972c11842b56453449e72617deb3177d020c8f25cf4d5fb687f4a3ddb5c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/id/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/id/thunderbird-68.12.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "ba6108ba9b4f31f49e7c925a6051738276c67545f7f8d2b3cb378e8834dbd0ce"; + sha256 = "546825968ad86e4c5c6effefd0f924cc1d10489fff7968f17401e3f84c4d1ab0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/is/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/is/thunderbird-68.12.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "a3eac36b640a61f2fc6bd62350bd8aaf020636035547c2b9d687df2bd2d7174b"; + sha256 = "1f2e2228c685be2d65d6e0b92eef8ff3e58d7b772f846d0707a9b02e6d0ad306"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/it/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/it/thunderbird-68.12.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "bf3cc19a7d1c1415cad867b72c5765dfced27511616a8cbd230516adf8d3f20a"; + sha256 = "41b27c8195432e1412e3c4645b823b8dd1f673eabf07ddc72f3d792d3f7488da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ja/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ja/thunderbird-68.12.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "d4788294f5e91c033c3c3251cfb614e50843631252a2b1fcc6389d099b1fee1e"; + sha256 = "68940d44d933bb7228d6f9a03406ca01903c54fdf57eb5a1e1033b12ef507df6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ka/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ka/thunderbird-68.12.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "8735be035cf0ab5d4b2102aab8b207c1cc686da8843b45f15c1be91931850968"; + sha256 = "ce0aff0fd47b00803ea66278b3514dcf65ecb5547878f8081f7ec6c1f411ce10"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/kab/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/kab/thunderbird-68.12.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "a570fd29e5eacdc08ed484bce7336f90ae74744e80d8f2ac0f05395cb3363e51"; + sha256 = "3936b56eaa1e05a96626f7d10c8fcc3ba9014b1385b21243c049b133b923ddef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/kk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/kk/thunderbird-68.12.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "186b7457a96a64da0564c1b411bb04598de1067362a6238f7327abe780cc6aa3"; + sha256 = "7fa0aa64d0f0dcc6f71d6a21647cc4fccef935b783deb5d19b88f5b96b4b4ec4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ko/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ko/thunderbird-68.12.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "3c9513362c6b7a64bf6e74bbfad6ef586b0085baeb9a8ad8eb2fbc73461e9f67"; + sha256 = "4bddd0ccb747bb12cdc6d88c2c9544354293000c586454bb5932f4d81afbf400"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/lt/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/lt/thunderbird-68.12.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "e90df1606ec0e875fa02f7bf5a52b14d84f758bdc18ab0f395703c0129a18e57"; + sha256 = "f1a3514188c1b887afd2c662a1b6abf6fe37b558864be0cc79e87ed147188461"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ms/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ms/thunderbird-68.12.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "ea686adcfb5cf4b1642e7dcb21053090ffb57d344b27269d807cebcf8469934c"; + sha256 = "7ea045d6db78ec7d6ebf164c8e3d28c2540a573238de518e934646573aec71dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/nb-NO/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/nb-NO/thunderbird-68.12.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "6f827fee307917b590b99b5c85b16337865f027059f52bc9ab12da33f80448b9"; + sha256 = "d2c0e2099ea60b9da95ebd9bd79a5d0a6a1ebc84b8b490511a68c81355f97761"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/nl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/nl/thunderbird-68.12.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "b88843831b982d1317e8bf64df99a8c7a1fa9f67461aa966b2737f12715c9cf3"; + sha256 = "48741be79422d80140ec862d004fa75a407f67490f67a3e440c01e0defe1f85f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/nn-NO/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/nn-NO/thunderbird-68.12.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ab8383a432f55944d417108b59d891953f2d322ec81d09e971ec63d1883d4b46"; + sha256 = "b40f0d7112cadab322c8b71cacce5d6df87fb80f40cc55ca22c279016c3ea805"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/pl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/pl/thunderbird-68.12.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "0f8c0feb68b090598a3db9295d4b4e09d9ffdedb69a73914228d7ef76b768414"; + sha256 = "e64b10526cb460f437427cc4a7ea90959cc693a75fd6a61b43e9d3fd76ded618"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/pt-BR/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/pt-BR/thunderbird-68.12.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "ca78fad9dce15534754571b14d82ede798b123210599ade352016420faf0db5a"; + sha256 = "bdb558f9430c06871954ec6c7d54267625184a0cba914a87ad199e8f32b03de2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/pt-PT/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/pt-PT/thunderbird-68.12.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "cf79430e02259d9117feeaebb5fe02139c3e3d95013e48fe290550814200cf6e"; + sha256 = "4631e8247446653e91f239fdb5ad3c8531f3d007dbdc83818178a4cdc525edf4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/rm/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/rm/thunderbird-68.12.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "cc7d9614130f24969356b3496f4d322a9f73cafa5c7b60302ca8f2e2efe1f6ec"; + sha256 = "13e6aca7139fd89e83e7ae9b71253731f0954b0a83cc3560ecc00500b9bc1df7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ro/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ro/thunderbird-68.12.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "a8fcc2c6e0755fe701a56c2fa3bbf2d288d6351179ee74b8aa3da3180f14cdd1"; + sha256 = "023a567c42dad9bdbd465c8b99f12cf5f667ef4691e16971e09496c4a7db0f12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ru/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ru/thunderbird-68.12.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "b9f68985e70f8aa47c36cd4a4fc0fb41918d43f089cc760ace8ec879e2561770"; + sha256 = "9ec35bbce5f026a4262a5d708b53a767f47ac8e90314513d36a587d1a49dbb6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/si/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/si/thunderbird-68.12.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "a2563b3c9d0ecb567c366aa41cb6a10bde8d09b8c1065cd3934c8c221afee056"; + sha256 = "c540b94a45deeddf1f7f5a8cca8de7e944ee8ad9f8595a308836c159901ec0b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sk/thunderbird-68.12.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "566906f011283fd27abf55e1e9a1bf7504e4028f7c4a631716ba590c07fe9d91"; + sha256 = "5296241664023773d2c0c4fa55e74eb6470482389c834d1934c252f79e79ebff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sl/thunderbird-68.12.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "8b74b751b3ee706be9aeb06726ffd3a989a57a1dc9794112262fa2aac45498ad"; + sha256 = "cd0376137d8018875873332fdfae3bc3c0d6b2a2b881dfa970d7d7999e8b312b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sq/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sq/thunderbird-68.12.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "9f7bcc51d4bb3f7c8d6ae49c61b88c17a7a59f6de8d2f62e0ee3fb3a68d30791"; + sha256 = "6fbf47759ca8c4d7cf30ca3af8a3fd35a01b7738422d29448cfd9eed81eba49b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sr/thunderbird-68.12.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "809c22c379c0c9943acb23de8b7023843ad6ecfedb9cf89006d6889ac1214203"; + sha256 = "636708320247c7c45622fd9179d5689da97472a9308f11810623129cf5a0e8d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sv-SE/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sv-SE/thunderbird-68.12.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "9381345ab9229f4b8465c183c936c17ab73680fa6aca27535daff9a2f9a133a3"; + sha256 = "9550c173b047e3ff774f4c3faf2c1f125b3abc34e6feb5801c108fda94e54e4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/tr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/tr/thunderbird-68.12.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "0f08bc1e65a8bccf8765cf26af5c09ebf6b77ff463af2f8f133dd2499c1d935c"; + sha256 = "ffe82a300c7fa7a0e826d11613f5187c003b009efa29f4755f17af0f88d9e73b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/uk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/uk/thunderbird-68.12.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "37a1fee3bcf2fca901c542295d01a32545e814217985414419a270ad9576c14c"; + sha256 = "b018769149c0a4ff323b90b5d51465733629e7c527b39381ba9696cb077ad767"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/uz/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/uz/thunderbird-68.12.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "50668670b10f3171b9033306d43c51ce24f1a48286c4156eff369530ae6d93d1"; + sha256 = "b0b59ac4d08c9f385f4ed7980065ce99ef24874734390a83af6e8fbd18173d99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/vi/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/vi/thunderbird-68.12.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "3588d2ed7c67459f5c091a1881821eaba72c9f3307624f7890549fcd1da120f6"; + sha256 = "901b40a99d84e7c7360fd5be6a14aa04ef6cc04fe1275cac26824b310bbd26e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/zh-CN/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/zh-CN/thunderbird-68.12.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "d8f2976535ef60e62c94338fd049365234a7b2a8658b32df231d1faa22529c0e"; + sha256 = "509478710f7c4fb404eec9fed0b6d22f4c5d76fee09ed833dffcefdacc53d55c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/zh-TW/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/zh-TW/thunderbird-68.12.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "aca4a8410429bde9926f6ce6a183439750f490fd68dda229531b2e16bb7068ef"; + sha256 = "a12dd777cc3eaf629cc7a6f4b8d4744cf63c3e778e559d9b3ce332414e509515"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 1e238bf8843..86dbf80a6e1 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.1.1"; + version = "78.2.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/af/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/af/thunderbird-78.2.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "540aa91a70379c4d6975820649abbe3063515bae031229f01ed7e794cf87395d"; + sha256 = "de73b113e488e76caca47b90abb4fa3f1c4d6ce04885d036f2e6aed81fe34038"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ar/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ar/thunderbird-78.2.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "18d1b4f33895b5c4b17199ca8412f8060f40660c7e45e024d0dda486ad290044"; + sha256 = "d6eeb95b1bd8e53663bd48570a0c2a03f570f906ca715ddf1d9f2cb8de37f3b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ast/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ast/thunderbird-78.2.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "dd87c494ef5f142517aeec3d8890bc553664b323f2cadb46bca597101b275c91"; + sha256 = "f244c41515a2382d15697a47b88781120c649e319d86a1c6350fd20cade25809"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/be/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/be/thunderbird-78.2.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "90e0d5354f41244e2ebaeeeb65959d64fcef52f914a15af7b9808125e6e25639"; + sha256 = "188c8850324bbc04535d4a1dfe1ef1f2e52de8cc2e1df7432623f6afcf8dbf1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/bg/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/bg/thunderbird-78.2.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "4e8f53fc2e1c3b8dddec3d62bfa104a458943c1b0794fcca3a1658b812359b97"; + sha256 = "3e7ab29fc795b577aa3bd2ac3df872c31a7ed22960e987d9bca6f348becb69a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/br/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/br/thunderbird-78.2.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "068c48e37b4d921cb33e2df27b32a8e9abfc29698c30779b1771f2ab61697f27"; + sha256 = "c1138c59275149aaa6071cf128e7b480b7f74fa0d8f237552a5c54ce1ae573e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ca/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ca/thunderbird-78.2.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1f09e12e53d7bc76551c47995b0fa5ff649db94013a66e4ee445e6901352ead6"; + sha256 = "4d18b0b11710ab3427bf917ebe17cdf5e98508f517cf5cc4c97822d42a019dd1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/cak/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/cak/thunderbird-78.2.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "e917249cbc16e1ccaf630a5335577e76d971f422fb7c7d9b7c7f05805de18d78"; + sha256 = "5231c3b6c9b57ab528905184b740dd23de470f8bc4814a13000c8fc1fe4877cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/cs/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/cs/thunderbird-78.2.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "89926439c396b64a701d688b2520eb1364e5f2a348a645651396e7f91a4b774a"; + sha256 = "04d1614000f1854b5d82e0d1740beb43ed9bef440b43f7bedce32cccec48fd59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/cy/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/cy/thunderbird-78.2.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "65a124a1840efdc33b0426a0a8ab8426423425326f7905844c74f7503c6e60f4"; + sha256 = "0ef895fdc1878b77650846d2ea4624a50d06838a3c51a91523019bb4d00a1322"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/da/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/da/thunderbird-78.2.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "a572014192e6ba98994f8693b062400b7909bdcede065dd363a3ab182cf40293"; + sha256 = "e909f7ba1890cebcac435c2cfaab7db1791785e6b5b1e8b205ee3b9962624c8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/de/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/de/thunderbird-78.2.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "a0eeef52d89bee326402354eb1de3f531c9c255d31840ed91e93110c9f170aaa"; + sha256 = "cce1e0acc3c61a66e5eaa065e81e01edb298b6dbf07a2376bf5a96ad2c1e784d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/dsb/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/dsb/thunderbird-78.2.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "35d0295ebd60415457a7defa40c5bdee2dbf40b08dad387aef0557dc511ce489"; + sha256 = "a5acad173a15e77e21057e7450d997387f88a608dd602df7509fa13743758445"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/el/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/el/thunderbird-78.2.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "135fe2424a1731e24c9602c40e0ae4f8fc551ed058fcd17516ce8f39a7d88bbe"; + sha256 = "7cb4dd233037415d9de96e0c292bd0a288ea62bc875b79a138aaf9639a8f8896"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/en-CA/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/en-CA/thunderbird-78.2.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "b5741a82e8d59300c1f2046b4a4deaa2804d90ad8e8cda7cda9a39b7d6293b87"; + sha256 = "158547432a7f38ab87ac5334b891921ef54f199896fe459cf65c81344d900edc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/en-GB/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/en-GB/thunderbird-78.2.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "61b0e85a24f56b1b7ad03e9d8206313d50cfc6480627cd377a4a4b1bfdd9f13a"; + sha256 = "1f434d2aa74143eb8695fe54f031fdc7270b1dfe7365896b08f9a55c9dcc8197"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/en-US/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/en-US/thunderbird-78.2.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "9f0cc0edd2b23bc67824d3e8ed19b8c0a331e69a307b6d48c20e0e29e756e7e7"; + sha256 = "f5004ba1ac64911aec7dec3ec60a415500adfb0bfd566197f0f4fb139c71ff2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/es-AR/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/es-AR/thunderbird-78.2.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "b0390addfb6133074aab52d1b6b73eccb9fae9031967fc94d57f95be30cce54d"; + sha256 = "49063e6e19b9c4ee1cd63826fda1c969d9739759a57ffabba5e2f93fc11de06a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/es-ES/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/es-ES/thunderbird-78.2.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "4d9f115bba5f9f32247465398e8ccd2f279776fadc3961f79b9fcc923c9cc363"; + sha256 = "216fe2514dc21190532b19af814b825d8a39c7dfe91a120848491f98c49f8ec4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/et/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/et/thunderbird-78.2.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "6db8f8c69d8452e402724bf3fc6fb42242d2839307f6ad387f813a97286f4773"; + sha256 = "5a89262ffbdc536abf9d780d5d30ce7d0c626a4cf75bfe957689640f94323a34"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/eu/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/eu/thunderbird-78.2.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "7c8165bc0a0feffd71431f3dd30ce99092a0816581363c2d317c6f40149234e1"; + sha256 = "f59c050361c617e4b2ca92f8e7081a135e976bb99ea4b650b80064aedef2c698"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fa/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fa/thunderbird-78.2.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "9537892fa5e9ba5b3f79b96fafef1e8e37c4813f0515f965ce05b410bc7c9448"; + sha256 = "b9764595b4cb08584ccce801c08fa19dbbced21c3f89045800d83d531b0c825a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fi/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fi/thunderbird-78.2.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "31ca37c4d0f13d1a30b2d7541fa9fbe80add66c6d787bbec069cb904d1157e18"; + sha256 = "98169b3018a61ae6c2303300c1942c7d1d14a5318147a08a883b5a7b7042eba6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fr/thunderbird-78.2.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "c7507fd9096e9c47632be197054be68631c9d1812b7242b4de06774dbc9c3b1b"; + sha256 = "49563e87d9543c52d33b7168c78adaab0483f14ceef22759541e927c13620657"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fy-NL/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fy-NL/thunderbird-78.2.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "0a3d9d62861eb11bf409ac20905e787fdb273dd1d74b754f10790ff7deb7160d"; + sha256 = "1f3444faf91c24f8608ec59a4f705b42c7520079e4ad6756e693e92cdc8b142d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ga-IE/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ga-IE/thunderbird-78.2.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "4bd0b50313e9a85a83d5b5a032710478feb2df52936bcdfd2621cf30a4d02efb"; + sha256 = "28b27f73016f0a4d53a6c47248c26458ca2bdceb46ae231f16086b8cabed5210"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/gd/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/gd/thunderbird-78.2.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a72ed3ea99e863f4a6150cfeeaa0052adf84f8f5ad52388b8bc30bf15d58a310"; + sha256 = "b81b247ebecd1727d27b64f96ba08b08cf59921e9b2e8ae732407b27e233c971"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/gl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/gl/thunderbird-78.2.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "5d9bae1205ac9490821b1b6d5b700a540bccbb21a3d41943d7f3ccb8576e2087"; + sha256 = "ea019d11fed7d87173b218d86fcee0dea7d4e20200bc73171fa8c1bc8f7288fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/he/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/he/thunderbird-78.2.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "7cd6417391db27934b6945edcdd9d14b46a69052af7bccd5a62fed588c77894a"; + sha256 = "6308a7e4e2cc35e48bbd67a1a7b8ab37112f47ab228c703a6db681ac7af79cb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hr/thunderbird-78.2.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "b641cb7393e1e655adff946c82c43edf580e9fe3852b5c0cffe8f6d12759d190"; + sha256 = "3fb27f1e001817260981567fdb9949ad2f34818e9c919bd16fa0e939cf993cb4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hsb/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hsb/thunderbird-78.2.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "39a27b797117eaed4e939e1c38ade2da13486f9050b5c4d87219cdd46abb67c4"; + sha256 = "2240e34fd713b39b410b584a8a6d06525f6abe0db2ee7b76b740a7252ec85e36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hu/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hu/thunderbird-78.2.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "5c9795de2316add4e482f9e074c861ef2e05411ea3792d6256d3c43359dc692f"; + sha256 = "f303a1f1219c7b23d71471a00174e6084cee3773af72e855faa63a5384b08aee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hy-AM/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hy-AM/thunderbird-78.2.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "be1ba0a8fecf9a577cd63de519f92f48ddaf7c4b68fd629f94bb2ebff3cf16fb"; + sha256 = "3e74775e459ebdca2661e2e2f55307429dcc4d4a6623bbb8447946a75c94dd20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/id/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/id/thunderbird-78.2.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "15eb3d6acda87645da2874cc92366fb50e821d7ec7885f87951366ddc66db2a0"; + sha256 = "0c9baf8cff28193f774e13c3a49cfd0ebcf27d8ef73ade151d2371ea69cbafac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/is/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/is/thunderbird-78.2.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "06549f464526e931f23c0925b402eb3da6fbd9bd16595387604fe7edc62c4672"; + sha256 = "5c505948333d9259d87aa5f2b53f33ade1bbbfd29b9d5438c2688d34891e29bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/it/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/it/thunderbird-78.2.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "d81344b5dc0e131d1796f63de559a18b59dc70403a957eab737354ab05fd31c4"; + sha256 = "a99896e8ccf8d01099834ee502601cb9de993fd7101e426cb87c240a744f2f88"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ja/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ja/thunderbird-78.2.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "48bd5534bfebd6c6f976ea4230ac7d364544c1467b2912f0db46fd23944d0908"; + sha256 = "83be10be5e946b785ac61e9a51c7054357c69af0a8e7bca524e27961dea4eef8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ka/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ka/thunderbird-78.2.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "8f581c4d9f6c2e8f79bf7be92bf06a69d0dfed017346e1c380a31f541c5155fa"; + sha256 = "585a1d805663225b1c154e27b54aa1aa5d8a1b96576c0f8ea36bde7844921474"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/kab/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/kab/thunderbird-78.2.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "2cbcf1e64dcb914af8dfa0f8dab462d59d37992b3f4e22159e2edd340cb6e73a"; + sha256 = "85128be7e4c28a526d0a395e38e86e5e85dc6c154be6b16fb2df6675effe3d0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/kk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/kk/thunderbird-78.2.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "1fd067e9751c60dc6c6dcf1e5cfee3650758ae6593cb20fa5e6103cd01e6e6b7"; + sha256 = "09538c022bbcfcb2a77a7ab11b5569eb56b483817d199cfd0ede68ad556601d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ko/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ko/thunderbird-78.2.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "efdd154ad42d1b8f257d0cf619afc4bdea44d7014882c82847cb5f21d7037469"; + sha256 = "3e6f472e69d40d46f388096e1d13bc6735860021fc655e3efd4e5b93b1a83240"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/lt/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/lt/thunderbird-78.2.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "4256ec374ea5a22553469393e7fde51b46cd2ade5a620e9b0fc442e9d524494f"; + sha256 = "8b85c0874306afd3a39d8cf851d378f5f1bfce74129b16b02230c516001adc92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ms/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ms/thunderbird-78.2.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "40f6fc9fb01a83288a6952b7a6e625bd00659594f7fa21ee883c16501407b8be"; + sha256 = "b14e7baa06a2d4f98313a7f363b0d998f902164abad13a992878812cc5a0b6c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/nb-NO/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/nb-NO/thunderbird-78.2.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "b3f363ccbc5946c6e0e87ca4b75e12e4e4372688ae7a034c9cf37fd401794840"; + sha256 = "c3718581db153ad8b171b3c454e9d156e3d55ff0969217ac36435d13ac0c7c3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/nl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/nl/thunderbird-78.2.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "6963f3f09cf8a3370b06c894aa744c4ddbaa7c11df4e41f540a21427ec391135"; + sha256 = "802417acdc722e34c21936f840cd347ae86cf5ac8ad2ae05bd1e1ae078c4518c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/nn-NO/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/nn-NO/thunderbird-78.2.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "da647b3c85db5ebbfbc530dd8d8fb1005928430775cd5c8a2999709614f4e35c"; + sha256 = "5034f1fe526cab8de8091d5f20851a678e742ed37fa80e8491f3891ed89c43a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pa-IN/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pa-IN/thunderbird-78.2.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "9df18348eedd3b43a13ac991b875fe12678929faa58712b09ee7364a8dedbd2e"; + sha256 = "01ae1e84d990433b7cbb12dc637deec37b32998803cb60f5834d386e080505f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pl/thunderbird-78.2.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "7f60d5a0a819f6b69cd3f8444c12758f7cee17a681859c03cbea29ec27e1221e"; + sha256 = "84b877dba77c8be4400f4fc76128a85878781c4d8ff7845d265225211092674e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pt-BR/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pt-BR/thunderbird-78.2.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "229073650b742b4566350ce82ea65f93f639a2b502bf706de4038c3c13ead354"; + sha256 = "4daabc0cad02b878d8e17af4402b6b52fdd7783f89192909a43bed09f8aae196"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pt-PT/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pt-PT/thunderbird-78.2.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "f8596511964a688747ce51cf0ca6bb6da65ea78b9b3ef70ced4f69fae8edbeb0"; + sha256 = "6ce92a7a1ea62398d22ee4e4fbdc383daa5d35d38c83cf1852953757563d17ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/rm/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/rm/thunderbird-78.2.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "fb101dae4058f2cf804aacaf60c1354415cb0287432bb367a83e2ef8109375ce"; + sha256 = "d876eb51534d8a5796b486f22f9602bcb9c4cd9c99042583f95c4464f7ee99f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ro/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ro/thunderbird-78.2.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "1cb1fc985122dea685fc1998764c60979a7c357d5e1e0646b8c4f45e856b4f00"; + sha256 = "ab4bfaea0914401188d486554963c9ab3014237e7116afdf274dce6e55725cae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ru/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ru/thunderbird-78.2.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "d89b9a418c78422e2a715e7e1c5d2bf57e90c2293ad63dc5e9f2645fdc910103"; + sha256 = "e722a13113896bde97dd72d0c7182c26734d7d546d8fe210bbce900854ac925c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/si/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/si/thunderbird-78.2.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "584cd0dca877163073824e9dfbee4d6146e0ef8bd0b23cd2325462a1a72a41a4"; + sha256 = "595588d25de16c3781c85a9ed5e3c767d4df85f0820d4503770468b1669e9411"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sk/thunderbird-78.2.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "cbb2b5678d11eef244a175d88207e00fc59584afd0b788a82319987368ff19c2"; + sha256 = "f30929cad216539754842c0d938b4d5b8ec5f4e813b3ff0d5108d9c4a0fc6df2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sl/thunderbird-78.2.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "e8727e9942c4555d6413a3ebe1d4b2ab2ea39da4f5b3b2ad7baaeb8abf49fd47"; + sha256 = "65d716b3fb5cad93d17704b62fd035a86ef6838cfff6ad95e571cedbb9e0974d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sq/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sq/thunderbird-78.2.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "31141f45121dab9c5ce3f3d6195264df91e61e434ee993c409c3cac164215737"; + sha256 = "38c652f6aae768ab7a8b0c1e975c676a3724ae22f5f7e3ffc6224ee032a9dc47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sr/thunderbird-78.2.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "dc9a868b1345da0633d090877ae6cddaa3a1b2bb1fc3113bc9de2aac1c30366c"; + sha256 = "7f73bcc8efb4452fedb0f9707c5e2b1d0db936fda4c6b9582207043aeddf8747"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sv-SE/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sv-SE/thunderbird-78.2.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "fab7e11f8de1fcd2e8719d20e818d8bd2c39f7539328fb79f2cce56d4f312a78"; + sha256 = "221974d62563b49f6c030b7a1f6307a71e60ce2a0e107b551363621320bba485"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/th/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/th/thunderbird-78.2.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "fa3173940d4e7109385d65b479297110545cc7e2e76e8a657f376553e370563a"; + sha256 = "a8641ee0dc5bcd40ec84a4d4640e74e44710b5ac10d629ea0dd42ad2370e8d3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/tr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/tr/thunderbird-78.2.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "a8cf6b95a6b890892d034c0b014a62f710bbafa34f3282a80e17828ad9365513"; + sha256 = "1d80d967b5ef98f0e642390c55618d454f2d82acec36bfd56db21e872490ff66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/uk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/uk/thunderbird-78.2.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a5086a87a87ccb605154aad5bc2986d6fe995391189b3e452640210e2016b08f"; + sha256 = "fcc24a9885db5511c0b2859e6472d436769da2670573177f7bf332fb363a3ee3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/uz/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/uz/thunderbird-78.2.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "b5bea650b678808b7fbcca432c1de0121dc19886b2f32e764e4fe1a797d1e8ab"; + sha256 = "b0f62e8fc5c6da398ad2e1a3488ddb37f0075c90ad54e6028293be7cfcd2f6f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/vi/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/vi/thunderbird-78.2.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "8b8b57417b1d6faeb283b1b6037eac92841029bd73769d5cb8bc6c227e87efbf"; + sha256 = "0e38a1b645894ff81a481250ed434157fa2b70792b423c31dab61288612a82f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/zh-CN/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/zh-CN/thunderbird-78.2.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "4a0c8629e2a5e5f95799169dba4ee9c10b728bf503e090ed829cdd11fbeb57d1"; + sha256 = "04f37793bd17df88573d9d3f8c8412c26cfb3332395689a06f5fca6efb02b2ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/zh-TW/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/zh-TW/thunderbird-78.2.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "11a892d8ec3ec6e2dccbad4b97ce2fe7cb0a0b1dc309bef9819432f0be9d510c"; + sha256 = "6c1e5b71bb2a9e005971050c9643c52090828e1ecb3910d66d2d0dbaa107011c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/af/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/af/thunderbird-78.2.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "a254eecebf45c16f55b7d72cc38da2c4d22f49704cdb5db72d2adfc199a7a78c"; + sha256 = "2601d98ad27a2ed7277f673876c2a7d206fe1cfd8c7c8febdead85884031a416"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ar/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ar/thunderbird-78.2.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "3e735d996bb3bf2674f1c04f035489893169ab632208af1427756bc3c15b1600"; + sha256 = "5d126b1152b42b6bd6c29ac602b59ab88f3491b0b6f2a69aa1e6ae3d9ded04d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ast/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ast/thunderbird-78.2.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "a8fe0f85c250b0f71b0bac30cd51e10e5d1ded4265775afe93f986ccde4fbc49"; + sha256 = "7b22fbd980df00d6b1a2c0f14d68a3a7daf06dcb6a13033ca2619371b098445c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/be/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/be/thunderbird-78.2.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "279a98d38f6c33945ddd1e86c9263e72f9a52555e7f26c56a2f3062696436bbb"; + sha256 = "bd59d2a9e70944a736e8e5db100b2cbe937fb8021577fdd912087e2cbe38723f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/bg/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/bg/thunderbird-78.2.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "cb23b56841818af2e3e8dc922cace29c8538d22977ee951dee744bbc490c24a6"; + sha256 = "ce3906cafce8ce00c4b69f2b1b584f7e4148d2d40ac12916f1108f78d7d3cdae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/br/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/br/thunderbird-78.2.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f729274b064205cb9baf57be3732268a2c56893ac6b17ae6ddc0aed3269fda15"; + sha256 = "2f41237e0dd3dff4e0e4b196f8d02b988d7e5db3ac1984ea5577ce5052d43514"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ca/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ca/thunderbird-78.2.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "eb434c12d8d841eb8426b95663591f742a9e62b630cadb7afebfa79ab1142a38"; + sha256 = "0ec94acd77cca38d37dd23fb240c3c9e3840defccb491704d01072c1cab1f543"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/cak/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/cak/thunderbird-78.2.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "daa19634d796f849ab9b3a575bc53e451453902f82ce7384a7ae5ae4f99a2165"; + sha256 = "1c77ebb51a83c57c7d81ef278f9fceae07f98330a8ccf8f863c2f0b613141e23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/cs/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/cs/thunderbird-78.2.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "181cc3c70985d41a806395b353ccd98475c37ae8151fd5f59adbe25bf2059457"; + sha256 = "adf8c11ff60e697fc5087698088c42c95a15766ccebf24d77141a53dc255c366"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/cy/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/cy/thunderbird-78.2.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4cb93a1b38582e6fd4e4fc514c36e469b88bedf0bd36bee4d7a66d9c33c3c8ca"; + sha256 = "9b7c51652714c116c9bb22fab4f0fc6dcbce6ad2133cc860067898841d01b5b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/da/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/da/thunderbird-78.2.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "6eb46018b763d22e62739ec9dd98d5f3804f85b5b65ca3092c42d5d9a1a258ee"; + sha256 = "e7245ea0909efccaa9b94701061410437f16273c935484dd3638f5f4fa65aad9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/de/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/de/thunderbird-78.2.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "dff12cffa89c1ad5666b92b66361e17c604f0ca34305fb0e3b06be5fa8fb0f96"; + sha256 = "302394d24f919b0a24dc574001458b265bfc90024bf21b3d98a43b31ae50adf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/dsb/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/dsb/thunderbird-78.2.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "efa2f9449703fc0941620650f1ca1332682b2866339413aa03f2438580d18f78"; + sha256 = "18ea8d27387581d49dd156957a089f1dbbe05f2772811aeddb1ebe81d26961e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/el/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/el/thunderbird-78.2.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "675cfc628dd02fe874a701e0e16986c797adac263605b304c1c69bb01552037f"; + sha256 = "bcec06d4b01268ca90d99a98a45c2ef5927ae4152b6b2d356332f3690de08f62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/en-CA/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/en-CA/thunderbird-78.2.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a710c91df20b4b25d9e363b585344e1595ab96b9cc1df35e973e485834942957"; + sha256 = "475a1393917665c17bc5e787ef29dd886f1480d544f55d1caacb2a89503da685"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/en-GB/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/en-GB/thunderbird-78.2.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "3acd3020cb6116588a0f061aa9ba5d620477e3265eefac3dc22f4705757fe025"; + sha256 = "dda5664fd8d843f3f29b85b855d54e00d15188c57e80c01d79a8be0a2eaa0be1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/en-US/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/en-US/thunderbird-78.2.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "bf9ebc54aff457654b5ea1fc81437281f70d78de96d5a4d3586ae83fb8135d39"; + sha256 = "b299267b8a113dcd325bc6a928c561fe872535e1e876518e3075b85043aa7b23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/es-AR/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/es-AR/thunderbird-78.2.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "cf1c278a36c9303956ac8dc29a51226a42ea17cf64559c34bef318c79ba6ed74"; + sha256 = "e3e7cb829b07b7db95cad09c8887b9c91123665cd4601b685e3c7a7b0036992d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/es-ES/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/es-ES/thunderbird-78.2.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "4a9356476a18f292f763f1647611189ebe89ee368a3f01a7c75ef8dce48d91af"; + sha256 = "be8428e1cce22aff5000bdc11f632adfc4c1096060a7456d36230ebd6040d12d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/et/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/et/thunderbird-78.2.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "03d3a43153b714f334a8f5d7d23e9080624488ec54400451b508c6aa50bcd594"; + sha256 = "deb81a63704b12ad2a945f5f0dcec878c3b7ec46f551f2d0122c03c52c031f73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/eu/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/eu/thunderbird-78.2.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "a7cca16186f0e2627dc6e06164b3cb2bb691cf798f7c41378ae90349521d9199"; + sha256 = "8a2935dd5f83854b4d98bdab67e7b376a7e1d19a2ff790234516ba8211ed7345"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fa/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fa/thunderbird-78.2.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "6a19a79d409acdc25c69b5c8d75a18f2de665a7d18244d578e4ef0f65597daea"; + sha256 = "c39189bc1f740a1e5a372eaf3c6e99090f04ed8b1e86016c54ed25612d16f341"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fi/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fi/thunderbird-78.2.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "4b82f0fadfb5f388948e33fd3408e9f6ece6737c8e5e4b53c164a124f017e553"; + sha256 = "4f23c9941975e67e6e40d7a504a24e4058a27786c5989dd3e25cfc4fab4c4c0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fr/thunderbird-78.2.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "bc4fb423664576d4d94eb24383e3f4f23c199e52f1c985fd3bfccc947212f82a"; + sha256 = "4de9885664bf4828355d09ceae11fc7cfb603d4514255b4de464c0653ddd45b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fy-NL/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fy-NL/thunderbird-78.2.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "6eb76c3a4d3b31160dc0d0b807596095354c7c0740f5593f86042af1e1b03d48"; + sha256 = "82ae68d970a02ad57aa9c3dfb6c1ef7783c25211e9228c0bad515c3fef385f88"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ga-IE/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ga-IE/thunderbird-78.2.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "5321fff3eb4d341307233976de74624f6002abb8662f40ecbf77e3bdb5757add"; + sha256 = "e6035d81bfa5c58ab79e71b9895638f23e47e8ab2990794786c5e9f590bb70e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/gd/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/gd/thunderbird-78.2.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "515207242fffd0513a550017f8bfb53061f0a0e3d795a111adf0154b55363d38"; + sha256 = "2c628c5ed8ad0c00c42b384f8b925887e624f6a6dee69c86800a9b5137f04886"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/gl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/gl/thunderbird-78.2.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "84c32bd92a783c680343aa5b01dbf58e37eda9ee466b16f817a79a135e37fbe5"; + sha256 = "49b8e22610f8e602a3870f541209251b61da8cb81df7f0a762d01002fef568e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/he/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/he/thunderbird-78.2.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "96d07263578fb16068e0f48309552ea9237d3dd5a46fc63e3293326778cb7af1"; + sha256 = "5bb7193eb498d1edd713e18bbac630ba881b0a9b7fca9b05c9b8e4dd1ea1edbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hr/thunderbird-78.2.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "9c612aad3a12530052dd609c2f20a3739c458b3c7f3d761e7c00754f9b43db95"; + sha256 = "c31022ae9a1665cc0b22ab0e911730ccf5cd0dd24614fbd8d3bd51624760baa3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hsb/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hsb/thunderbird-78.2.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "376e4d8eadb9bb8f301053d30260ab0cbeb3dc9f590564583f07547585105fe0"; + sha256 = "3e286b3ccf66300ead4d6b98a88a370fa1bac96244b143005c4974f075ceca92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hu/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hu/thunderbird-78.2.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "4e7e51dbbe359ec542e553f5b0691f1d191343261094828b2572dd5a03ec2c8a"; + sha256 = "6d0c88c46d0f4ffb296638e4e8217041d8fdaec3abaa6bda7b7cf97c4bcabc2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hy-AM/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hy-AM/thunderbird-78.2.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "735624e30d1986d6c822fcbee4694389cf8a0061eba40926265bd4ac998e2186"; + sha256 = "aac23dfa8c299623bca2e3b0501a636c630fbf3f5b08689911569a568b3ad060"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/id/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/id/thunderbird-78.2.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "ce6d668f38d1e74e7c8bbfc7408edc749eed9449908044bdd57b2dcd868cb89f"; + sha256 = "5bd5597cb6e91613a39c288d694f3af4f5686dcab1573e3b58c04dce3d1de865"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/is/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/is/thunderbird-78.2.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "589369ce68b6c78ad7753ddd14412eb68f438dbd7cae449f828288d25ee3f795"; + sha256 = "bcd926c704177945aa7b917fe12940e058d12e6cf8a3eedbf1ab205fb9c41b80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/it/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/it/thunderbird-78.2.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "fd909d5aaa68a208050a0812f15024ef115b99fbde0edb0afe995c3b766c0d76"; + sha256 = "04ca02a4fed6e8d904173d9ce52c16e47d7e9b3d16f5483d986f8188ec79d65c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ja/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ja/thunderbird-78.2.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "160c2a1c36ef34339270abd59fed13b37414f8c37edd60463e0945e6751a0c74"; + sha256 = "1dbdc30ec3a06f2e7e7d38d9036fb90a2fdaad42356e9386ecc710d9a51f94b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ka/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ka/thunderbird-78.2.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "e822a28e62aae6d6e84e6788d5311af45396248f48cc60152b4273d75359dd8f"; + sha256 = "2db1fa86ac87e0b8001b99c0eea30589db515c58e10548565533014481b1be9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/kab/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/kab/thunderbird-78.2.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "2ea58cc79b80966b5bbc310fa32bd27621f95d4ffbd3646bf9e04f922c36ca6e"; + sha256 = "8499d0d8a0372617800b039c9198cc372783b8ff4ce385fc692e39b1dca22576"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/kk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/kk/thunderbird-78.2.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "a874bc02f065be73a54b70567b7a04be5fc6a9f766f3b054b12555763361ea2a"; + sha256 = "29b228042a7f06c22300b123cc0fcdf7a86005d0d4c3c282c97635ebc25ce826"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ko/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ko/thunderbird-78.2.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d9678f72569dfde84544fcb9afa7cb8d5a4a35baa52d4e560aa2b082a418ab00"; + sha256 = "a7af79975107cb32b408c7dd26827793c3c11f998705bc711c60f3dd6b7a1173"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/lt/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/lt/thunderbird-78.2.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "1d7ec489dc52fae0f7597e40f8505bdd6a57a717389c75b66481749e85e2fab6"; + sha256 = "7a5010761d0af24a6852f32b1ebd6b543b1e1011888ded3f4a4297fc35f455b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ms/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ms/thunderbird-78.2.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "5d0c7cc00139c39a69dfc9ba1dc5c83b56973f26679860d048952bcf09baa737"; + sha256 = "8573dc35bd69ff20d05aa06484a2243f5a35ec78c1c31dbccc067f0cb9e6617a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/nb-NO/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/nb-NO/thunderbird-78.2.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "e72a25e7d53e6e0d470632c487d31e08afdb6c27543d50c93ff72ecac3f70bc6"; + sha256 = "722c0a4ce2a0d774f8971707ff553d9f2e62af10267ef491e670b020a2d8a49c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/nl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/nl/thunderbird-78.2.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "19efd7323e671fe25b64ee44c85f698f608e6c2b18fdbfc9f0cc95b9cd8cd149"; + sha256 = "63a08123e795ab8e51a2c98f33b0b6424c1f5f2c09a5d1683585f9762813afaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/nn-NO/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/nn-NO/thunderbird-78.2.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "b4be21281c6a13de05e5d0b96e43454bab662140a00d3837f609e23f14360c90"; + sha256 = "8968de35faf9fe304631ece4e08a9944342a08dc518ac1eec0ba2d5c1ff268ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pa-IN/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pa-IN/thunderbird-78.2.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "f2795a504616404616f7d22022e105e9e4ea54025d60e262c405b867cb9c7936"; + sha256 = "57685a05321195019ef4d3c489dbb14ac0f1bd5ce51fda1f7573392de215e4e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pl/thunderbird-78.2.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "52f80b074dc168ec00d0fd78f6376c1dfd357c2b7e7ed78bb1b9cf17536508a6"; + sha256 = "d98967c9d54f9314faae53472b9d1506576761cd3de09747d3b407e1f26931e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pt-BR/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pt-BR/thunderbird-78.2.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "d02867899a54eebffb2b6e600f7e6260b960d686a8bcd61ce705e9d0bbebe377"; + sha256 = "14fa89b2d8f659a90e19068130ce1a2da83137b7fb9a5a009d2363ccc2415009"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pt-PT/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pt-PT/thunderbird-78.2.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "659a7ff3a0dcbb4f3fec32eda6b5a2087191c8d49ea310662ad540433d869180"; + sha256 = "279f325e75157e0cedffe6a455e731373b077078f70b89bba76e12e2439350d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/rm/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/rm/thunderbird-78.2.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "d9ee3c5e3cf2d7eedced9d12bf4d499ae931c262be166af6a14bbd4a2538788a"; + sha256 = "7432093e7516625957c3dcb90e8668fab1e22c0edba0411e3e2106d49e052fdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ro/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ro/thunderbird-78.2.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "c3db9965a25d52d25cde0b52bffcc274ae32862fb29be368f27b102774d0971b"; + sha256 = "f5d5f564cf56c66d1f2f9717df7c7f021532dc1912384c9921ca286030f7d82c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ru/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ru/thunderbird-78.2.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "f0356ef5eadccfcdfc694d0bed9b1e4027e4883095f9c117403a68f1cb2810c8"; + sha256 = "4c4e31e74c4d10d88044fc49c24b3ae3ffb0b18e4a23295b60ac2d38d723753a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/si/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/si/thunderbird-78.2.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "5b5d17a2b098fbe1c2d8686ab0e1adb7c72efedc38365ca9b39b1e122302c85c"; + sha256 = "689be324633f6a872a09d6498d8772562dceca9bca96f7029830c965ad2e4138"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sk/thunderbird-78.2.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "b39bd41a38947ea467e1a89c5a173fd07cbce09562c10e6a60adb2150b04c9cf"; + sha256 = "194ff5a23a3a40ba98fb1968965c79f99246c6d93b81254d11df5d22530f1d86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sl/thunderbird-78.2.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "602e0feffc5b786930005c376ca3e8819b834a0cfc9a649bc46d86c27999144d"; + sha256 = "9746db435fe3dbf5ab51603780d52862a6afda0e40c1ebc915b309ac93e75e25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sq/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sq/thunderbird-78.2.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "fb265490d00c3a844f73e8f531b7c73f3787cb4e4ddc7cdcde72017fd7f3d612"; + sha256 = "86f675921cdf0de41855d5e2c3d2d56c163d915ac8a0f8cc9678d1a55f87e069"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sr/thunderbird-78.2.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "1574eaee6effc4df2c88fc94597e295f352455a9f68501080385c08cb4ab7e35"; + sha256 = "587e4c867dd43621c8e5e04461c4a2dcf2b0f256476b5b72d8fc6722e573e347"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sv-SE/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sv-SE/thunderbird-78.2.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "8d55df4937fe28f7b9d0fcaebcde3fb9650de9f0b74f677111f339ae2365b822"; + sha256 = "a46294d3dafc8bfaaa7f5376c2db2402f31f24664e73045c653ea8660079b879"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/th/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/th/thunderbird-78.2.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "6a872a6c332c7b3bfc24721bf1114c85475a73ae5c7b16d8637b0eb0045e112d"; + sha256 = "6105278c11c3e586240d50c9612730e75caecd08765b5b5cfe010f37d71c971d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/tr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/tr/thunderbird-78.2.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "26d2b8493a1508591b45f9ecc43598e244856c0d9bc3c185721a7239679c4e63"; + sha256 = "4bdd2c91e8f361d1b2ade88cec06accb244adf3d7f1d714feea3e4004ed31968"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/uk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/uk/thunderbird-78.2.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "ddb4b5fab55ded8f7bc2ae914f41af42b3b69c738727b055efd5e05b253ac872"; + sha256 = "40e2012a5b5dc05cb887a6c4cbb0c8f7bbc25cebd2de1247e5e8dc355cad78fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/uz/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/uz/thunderbird-78.2.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "dce93fab320f90ece938ae2b2343c1d27a1143b0183318a9d9e0cbbcfb607982"; + sha256 = "15f4aafba6b2bcb102683d9a665d208ab21c5767cf6d59c45d996fa26ef1e12a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/vi/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/vi/thunderbird-78.2.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "cf1b4f96ef1a510d21b232e748ace6e567d27e382393a7d7f51ab392f026d55c"; + sha256 = "32640a1c8e42cc79774a3b75539010dfb65e32c703992001eb03916d4fb46e91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/zh-CN/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/zh-CN/thunderbird-78.2.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "574acd0743a1202b6629883618278eb3ce113c518bc9c39f3d90e2dc12d4f644"; + sha256 = "09b52b6ebf0033738444bacfb53b84b1c98f7d3e10b32c001356083afbe4e89e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/zh-TW/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/zh-TW/thunderbird-78.2.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "51ccc5a4696841b3391a5dd9fb9ff1f55a9f6ccd6fbd86587ffb86c5f664f10f"; + sha256 = "606e416a158023f674eda141bf67f9b3956e3e231ba85605173d73cad0d22a59"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix index 3247f53f0e8..fef707b7293 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -71,13 +71,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "68.11.0"; + version = "68.12.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "1rdxizg1mpagh17fhnrbkilyv1i2zfcr6z62jf3ng31ns94za9kdg9f580srkp63png67jaj3b1kc33v5vb8wavl09n5d38g113x2m9"; + "33350vjgzvsg6sdhdld92z75k1xcf1wmngdcvzsj4f3y3aal73pyw03mlvgg6y36bm0j8fhaxvgbbg5zm7hxhn779z78970m4v9amg7"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index bd757e031c9..7a10c7f1d2a 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -69,13 +69,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.1.1"; + version = "78.2.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "1lf15zl3p8y1vxv4s04y088flkspf0r0c6j8gfrlfzla5ckfcsbad3zbygh6y73m35j882g7fbacby5a4hiw891zq2kji5dn3nbahyi"; + "2iya9a5qaini524wrdrnxx6wsrgb8fa2b1m42mlypskxjjgb7n66vpxlbpi9x9mqzc63ca2ag36fjpbpsvbv5ppxvpfwk2j1zbfvb5w"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index a487da6f5ad..d990dfb39d2 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "owncloud-client"; - version = "2.5.4.11654"; + version = "2.6.3.14058"; src = fetchurl { url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz"; - sha256 = "0gsnry0786crbnpgg3f1vcqw6mwbz6svhm6mw3767qi4lb33jm31"; + sha256 = "1xcklhvbyg34clm9as2rjnjfwxpwq77lmdxj6qc0w7q43viqvlz3"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index 2e14bd0eb0f..f8a70d322f0 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tixati"; - version = "2.73"; + version = "2.74"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "1ncrfc4wgf02la2h3zpdcz07b980n9232lg5f62q7ab79fjrcrfr"; + sha256 = "1slsrqv97hnj1vxx3hw32dhqckbr05w622samjbrimh4dv8yrd29"; }; installPhase = '' diff --git a/pkgs/applications/networking/scaleft/default.nix b/pkgs/applications/networking/scaleft/default.nix index 864f10553ee..b1a754193eb 100644 --- a/pkgs/applications/networking/scaleft/default.nix +++ b/pkgs/applications/networking/scaleft/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "scaleft"; - version = "1.45.3"; + version = "1.45.4"; src = fetchurl { url = "http://pkg.scaleft.com/rpm/scaleft-client-tools-${version}-1.x86_64.rpm"; - sha256 = "02hsn64kg22pgga5ldjwhnqc6jq8w03mwf40dfanln1qz38x9nx1"; + sha256 = "1yskybjba9ljy1wazddgrm7a4cc72i1xbk7sxnjpcq4hdy3b50l0"; }; nativeBuildInputs = [ patchelf rpmextract ]; diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index b4815803ccd..af93b7ee65d 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -2,12 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.1.13"; + version = "4.1.14"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0mlq4z5k3h466plij8hg9xn5xbjxk557g4pw13cplpf32fhng224"; + sha256 = "0hr6xbv01xf7z4r2jxxhn8xjdmca2198q4m9glh4877dllvfq6xj"; }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 224795f2a66..32a75cabc13 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.18.4"; + version = "3.19.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "1pmc2wi1pa346w89ayrrjv9xk6v6myg2zmx1wj4pd9qxv7ivrbsn"; + sha256 = "1dybq6104vc62x620izgblfd8dqc4ynaiw8ml07km78lq38anm6v"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 52da3b4a1ac..717b240c1cc 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -12,11 +12,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { - name = "R-4.0.0"; + name = "R-4.0.2"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-4/${name}.tar.gz"; - sha256 = "0h1995smlyiyhx7gpg9paxsfqrcn6g9bbp5h9r47i6an3clv1gh6"; + sha256 = "0xdy3dy2bzdiba8z94hjykyra8si8a5q15s0bri7c26scjrymg6k"; }; dontUseImakeConfigure = true; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index a6afc95ac09..7a81a0d679a 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wxmaxima"; - version = "20.04.0"; + version = "20.06.6"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "0vrjxzfgmjdzm1rgl0crz4b4badl14jwh032y3xkcdvjl5j67lp3"; + sha256 = "054f7n5kx75ng5j20rd5q27n9xxk03mrd7sbxyym1lsswzimqh4w"; }; buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ]; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index fe211d1b87f..9389934ffc6 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.0.12", - "repo_hash": "0m9pn1alxdib9ppf878wf186bvn0llik7vcpqijzcdzc18q9cldq", + "version": "13.0.14", + "repo_hash": "15is18x631ifsj4iwmrs1s9lc3i99hwsxxf5v42qldbmsys31l1k", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.0.12-ee", + "rev": "v13.0.14-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.0.12", + "GITALY_SERVER_VERSION": "13.0.14", "GITLAB_PAGES_VERSION": "1.18.0", "GITLAB_SHELL_VERSION": "13.2.0", "GITLAB_WORKHORSE_VERSION": "8.31.2" } -} +} \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 5f3fa345d85..84cf1e500a2 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -19,14 +19,14 @@ let }; }; in buildGoPackage rec { - version = "13.0.12"; + version = "13.0.14"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "00jzrib8f51b3wkl0zy9a9cr5j9kp6cmm49vxm27zgxpyz8k1axw"; + sha256 = "16ynkwiv0faa60msashj5w1bc4rdh7yv2qjmpcbf7dwq54gqmlbv"; }; # Fix a check which assumes that hook files are writeable by their diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index fab89d663fa..37fd8055662 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, git, gnupg }: -let version = "2.4.0"; in +let version = "2.5.0"; in stdenv.mkDerivation { pname = "yadm"; inherit version; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "TheLocehiliosan"; repo = "yadm"; rev = version; - sha256 = "0kpahznrkxkyj92vrhwjvldg2affi1askgwvpgbs4mg40f92szlp"; + sha256 = "128qlx8mp7h5ifapqqgsj3fwghn3q6x6ya0y33h5r7gnassd3njr"; }; dontConfigure = true; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 7c26ada9392..78d6631c2dc 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -180,7 +180,7 @@ rec { ''; preFixup = '' - find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} '{}' + + find $out -type f -exec remove-references-to -t ${stdenv.cc.cc} '{}' + '' + optionalString (stdenv.isLinux) '' find $out -type f -exec remove-references-to -t ${stdenv.glibc.dev} '{}' + ''; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 7154b8e614c..bfa0e0e5446 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -67,10 +67,6 @@ buildGoPackage rec { runHook postInstall ''; - postFixup = '' - find $out/libexec/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true - ''; - meta = with stdenv.lib; { homepage = "http://www.sylabs.io/"; description = "Application containers for linux"; diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix index 2404129b165..ac28abc31d3 100644 --- a/pkgs/applications/window-managers/sxhkd/default.nix +++ b/pkgs/applications/window-managers/sxhkd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "sxhkd"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "baskerville"; repo = "sxhkd"; rev = version; - sha256 = "0j7bl2l06r0arrjzpz7al9j6cwzc730knbsijp7ixzz96pq7xa2h"; + sha256 = "1winwzdy9yxvxnrv8gqpigl9y0c2px27mnms62bdilp4x6llrs9r"; }; buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ]; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index e077fc30344..40a6c887439 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -6,11 +6,12 @@ , fetchzip , optipng , cairo -, python3Packages +, python3 , pkgconfig , pngquant , which , imagemagick +, zopfli }: let @@ -110,25 +111,36 @@ in }; noto-fonts-emoji = let - version = "unstable-2019-10-22"; + version = "unstable-2020-08-20"; + emojiPythonEnv = + python3.withPackages (p: with p; [ fonttools nototools ]); in stdenv.mkDerivation { pname = "noto-fonts-emoji"; inherit version; src = fetchFromGitHub { - owner = "googlei18n"; + owner = "googlefonts"; repo = "noto-emoji"; - rev = "018aa149d622a4fea11f01c61a7207079da301bc"; - sha256 = "0qmnnjpp5lza6g5m3ki6hj46p891h9vl42k3acd0qw8i0jj5yn2c"; + rev = "1bc491419fa2925d018f27bfe702792031be0e68"; + sha256 = "1vak4s1p4wlwzpnqfb1c2sg62q82gnjpnmqrfz8xl6bd0z55imzy"; }; - buildInputs = [ cairo ]; - nativeBuildInputs = [ pngquant optipng which cairo pkgconfig imagemagick ] - ++ (with python3Packages; [ python fonttools nototools ]); + nativeBuildInputs = [ + cairo + imagemagick + zopfli + pngquant + which + pkgconfig + emojiPythonEnv + ]; postPatch = '' - sed -i 's,^PNGQUANT :=.*,PNGQUANT := ${pngquant}/bin/pngquant,' Makefile - patchShebangs flag_glyph_name.py + patchShebangs *.py + patchShebangs third_party/color_emoji/*.py + # remove check for virtualenv, since we handle + # python requirements using python.withPackages + sed -i '/ifndef VIRTUAL_ENV/,+2d' Makefile ''; enableParallelBuilding = true; @@ -141,7 +153,7 @@ in meta = with lib; { inherit version; description = "Color and Black-and-White emoji fonts"; - homepage = "https://github.com/googlei18n/noto-emoji"; + homepage = "https://github.com/googlefonts/noto-emoji"; license = with licenses; [ ofl asl20 ]; platforms = platforms.all; maintainers = with maintainers; [ mathnerd314 ]; @@ -165,7 +177,7 @@ in meta = with stdenv.lib; { description = "Noto Emoji with extended Blob support"; - homepage = https://github.com/C1710/blobmoji; + homepage = "https://github.com/C1710/blobmoji"; license = with licenses; [ ofl asl20 ]; platforms = platforms.all; maintainers = with maintainers; [ rileyinman ]; diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index 3cc1570161e..6ea26f7c79d 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -1,32 +1,62 @@ -{ fetchFromGitHub, lib, fetchpatch, buildPythonPackage, isPy3k, fonttools, numpy, pillow, six, bash }: +{ fetchFromGitHub, lib, buildPythonPackage, pythonOlder +, afdko, appdirs, attrs, black, booleanoperations, brotlipy, click +, defcon, fontmath, fontparts, fontpens, fonttools, fs, lxml +, mutatormath, pathspec, psautohint, pyclipper, pytz, regex, scour +, toml, typed-ast, ufonormalizer, ufoprocessor, unicodedata2, zopfli +, pillow, six, bash, setuptools_scm }: buildPythonPackage rec { pname = "nototools"; - version = "unstable-2019-10-21"; + version = "0.2.12"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "googlefonts"; repo = "nototools"; - rev = "cae92ce958bee37748bf0602f5d7d97bb6db98ca"; - sha256 = "1jqr0dz23rjqiyxw1w69l6ry16dwdcf3c6cysiy793g2v7pir2yi"; + rev = "v${version}"; + sha256 = "0drmx1asni3g6616fa4gjn5n43qkcf7icvxq9y2krpjxq78wcmc5"; }; - propagatedBuildInputs = [ fonttools numpy ]; - - patches = lib.optionals isPy3k [ - # Additional Python 3 compat https://github.com/googlefonts/nototools/pull/497 - (fetchpatch { - url = "https://github.com/googlefonts/nototools/commit/ded1f311b3260f015b5c5b80f05f7185392c4eff.patch"; - sha256 = "0bn0rlbddxicw0h1dnl0cibgj6xjalja2qcm563y7kk3z5cdwhgq"; - }) - ]; - postPatch = '' - sed -ie "s^join(_DATA_DIR_PATH,^join(\"$out/third_party/ucd\",^" nototools/unicode_data.py + sed -i 's/use_scm_version=.*,/version="${version}",/' setup.py ''; + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ + afdko + appdirs + attrs + black + booleanoperations + brotlipy + click + defcon + fontmath + fontparts + fontpens + fonttools + lxml + mutatormath + pathspec + psautohint + pyclipper + pytz + regex + scour + toml + typed-ast + ufonormalizer + ufoprocessor + unicodedata2 + zopfli + ]; + checkInputs = [ - pillow six bash + pillow + six + bash ]; checkPhase = '' diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix index ac3930853cf..8435957fe20 100644 --- a/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -3,9 +3,8 @@ { stdenv , fetchFromGitHub -, fetchpatch , cairo -, graphicsmagick +, imagemagick , pkg-config , pngquant , python3 @@ -15,7 +14,7 @@ }: let - version = "12.1.5"; + version = "13.0.1"; twemojiSrc = fetchFromGitHub { name = "twemoji"; @@ -25,6 +24,9 @@ let sha256 = "0acinlv2l3s1jga2i9wh16mvgkxw4ipzgvjx8c80zd104lpdpgd9"; }; + pythonEnv = + python3.withPackages (p: [ p.fonttools p.nototools ]); + in stdenv.mkDerivation rec { pname = "twitter-color-emoji"; @@ -44,23 +46,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cairo - graphicsmagick + imagemagick pkg-config pngquant - python3 - python3.pkgs.nototools + pythonEnv which zopfli ]; - patches = [ - # ImageMagick -> GraphicsMagick - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/07778605d50696f6aa929020e82611a01d254c90/f/noto-emoji-use-gm.patch"; - sha256 = "06vg16z79s5adyjy8r3mr8fd391b1hi4xkqvbzkmnjwaai7p08lk"; - }) - ]; - postPatch = let templateSubstitutions = stdenv.lib.concatStringsSep "; " [ ''s#Noto Color Emoji#Twitter Color Emoji#'' @@ -74,7 +67,7 @@ stdenv.mkDerivation rec { ''s#http://scripts.sil.org/OFL#http://creativecommons.org/licenses/by/4.0/#'' ]; in '' - patchShebangs ./flag_glyph_name.py + ${noto-fonts-emoji.postPatch} sed '${templateSubstitutions}' NotoColorEmoji.tmpl.ttx.tmpl > TwitterColorEmoji.tmpl.ttx.tmpl pushd ${twemojiSrc.name}/assets/72x72/ @@ -88,6 +81,8 @@ stdenv.mkDerivation rec { "EMOJI=TwitterColorEmoji" "EMOJI_SRC_DIR=${twemojiSrc.name}/assets/72x72" "BODY_DIMENSIONS=76x72" + # twemoji contains some codepoints noto doesn't like + "BYPASS_SEQUENCE_CHECK=True" ]; enableParallelBuilding = true; diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix index 7a473567589..5f09927e15c 100644 --- a/pkgs/data/themes/marwaita/default.nix +++ b/pkgs/data/themes/marwaita/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "7.4.3"; + version = "7.5.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "1g8xyv0najy4lpwa9xplx3ylxvn86dyi58j7qanc6r9yddy85ln9"; + sha256 = "0ig5wc6dkbly6yrvd13h4lyr8x0y7k3d9iv4rhg0pnjgcpna83mw"; }; buildInputs = [ diff --git a/pkgs/data/themes/venta/default.nix b/pkgs/data/themes/venta/default.nix new file mode 100644 index 00000000000..1086aaeb709 --- /dev/null +++ b/pkgs/data/themes/venta/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, fetchFromGitHub +, gdk-pixbuf +, gtk-engine-murrine +, gtk_engines +, librsvg +}: + +stdenv.mkDerivation rec { + pname = "venta"; + version = "2020-08-20"; + + src = fetchFromGitHub { + owner = "darkomarko42"; + repo = pname; + rev = "f9b7ea560def5c9d25a14015d265ba559d3501ca"; + sha256 = "13rdavspz1q3zk2h04jpd77hxdcifg42kd71qq13ryg4b5yzqqgb"; + }; + + buildInputs = [ + gdk-pixbuf + gtk_engines + librsvg + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cp -a Venta* $out/share/themes + rm $out/share/themes/*/COPYING + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Gtk theme based on windows 10 style"; + homepage = "https://www.pling.com/p/1386774/"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix deleted file mode 100644 index a84fc9c2e02..00000000000 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ /dev/null @@ -1,128 +0,0 @@ -{ stdenv -, buildGoPackage -, fetchFromGitHub -, pkgconfig -, alsaLib -, bc -, blur-effect -, coreutils -, deepin -, deepin-gettext-tools -, fontconfig -, go -, go-dbus-factory -, go-gir-generator -, go-lib -, grub2 -, gtk3 -, libcanberra -, libgudev -, librsvg -, poppler -, pulseaudio -, utillinux -, xcur2png -}: - -buildGoPackage rec { - pname = "dde-api"; - version = "5.0.0"; - - goPackagePath = "pkg.deepin.io/dde/api"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0iv4krj6dqdknwvmax7aj40k1h96259kqcfnljadrwpl7cvsvp5p"; - }; - - goDeps = ./deps.nix; - - nativeBuildInputs = [ - pkgconfig - deepin-gettext-tools # build - deepin.setupHook - - # TODO: using $PATH to find run time executable does not work with cross compiling - bc # run (to adjust grub theme?) - blur-effect # run (is it really needed?) - coreutils # run (is it really needed?) - fontconfig # run (is it really needed?) - utillinux # run - xcur2png # run - grub2 # run (is it really needed?) - ]; - - buildInputs = [ - go-dbus-factory # needed - go-gir-generator # needed - go-lib # build - - alsaLib # needed - #glib # ? arch - gtk3 # build run - libcanberra # build run - libgudev # needed - librsvg # build run - poppler # build run - pulseaudio # needed - #locales # run (locale-helper needs locale-gen, which is unavailable on NixOS?) - ]; - - postPatch = '' - searchHardCodedPaths # debugging - - fixPath $out /usr/lib/deepin-api \ - lunar-calendar/main.go \ - misc/services/com.deepin.api.CursorHelper.service \ - misc/services/com.deepin.api.Graphic.service \ - misc/services/com.deepin.api.LunarCalendar.service \ - misc/services/com.deepin.api.Pinyin.service \ - misc/system-services/com.deepin.api.Device.service \ - misc/system-services/com.deepin.api.LocaleHelper.service \ - misc/system-services/com.deepin.api.SoundThemePlayer.service \ - misc/systemd/system/deepin-shutdown-sound.service \ - theme_thumb/gtk/gtk.go \ - thumbnails/gtk/gtk.go - fixPath $out /boot/grub Makefile # TODO: confirm where to install grub themes - fixPath $out /var Makefile - - # This package wants to install polkit local authority files into - # /var/lib. Nix does not allow a package to install files into /var/lib - # because it is outside of the Nix store and should contain applications - # state information (persistent data modified by programs as they - # run). Polkit looks for them in both /etc/polkit-1 and - # /var/lib/polkit-1 (with /etc having priority over /var/lib). An - # work around is to install them to $out/etc and simlnk them to - # /etc in the deepin module. - - sed -i -e "s,/var/lib/polkit-1,/etc/polkit-1," Makefile - ''; - - buildPhase = '' - export GOCACHE="$TMPDIR/go-cache"; - make -C go/src/${goPackagePath} - ''; - - installPhase = '' - make install PREFIX="$out" SYSTEMD_LIB_DIR="$out/lib" -C go/src/${goPackagePath} - mv $out/share/gocode $out/share/go - remove-references-to -t ${go} $out/lib/deepin-api/* - ''; - - postFixup = '' - searchHardCodedPaths $out # debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Go-lang bindings for dde-daemon"; - homepage = "https://github.com/linuxdeepin/dde-api"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - broken = true; # 2020-08-22 https://hydra.nixos.org/build/125354866/nixlog/2 - }; -} diff --git a/pkgs/desktops/deepin/dde-api/deps.nix b/pkgs/desktops/deepin/dde-api/deps.nix deleted file mode 100644 index 5ebe1f6af95..00000000000 --- a/pkgs/desktops/deepin/dde-api/deps.nix +++ /dev/null @@ -1,102 +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 = "fb15b899a75114aa79cc930e33c46b577cc664b1"; - sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "f65c72e2690dc4b403c8bd637baf4611cd4c069b"; - sha256 = "04jyqm7m3m01ppfy1f9xk4qvrwvs78q9zml6llyf2b3v5k6b2bbc"; - }; - } - { - goPackagePath = "github.com/cryptix/wav"; - fetch = { - type = "git"; - url = "https://github.com/cryptix/wav"; - rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44"; - sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6"; - }; - } - { - goPackagePath = "github.com/disintegration/imaging"; - fetch = { - type = "git"; - url = "https://github.com/disintegration/imaging"; - rev = "9aab30e6aa535fe3337b489b76759ef97dfaf362"; - sha256 = "015amm3x989hl3r4gxnixj602fl9j8z53n0lrq804cbfbk7a31fw"; - }; - } - { - goPackagePath = "github.com/fogleman/gg"; - fetch = { - type = "git"; - url = "https://github.com/fogleman/gg"; - rev = "4dc34561c649343936bb2d29e23959bd6d98ab12"; - sha256 = "1x1finzdrr80dd3r7wvf7zb184yjf4dawz7s581p2dr64dcialww"; - }; - } - { - goPackagePath = "github.com/golang/freetype"; - fetch = { - type = "git"; - url = "https://github.com/golang/freetype"; - rev = "e2365dfdc4a05e4b8299a783240d4a7d5a65d4e4"; - sha256 = "194w3djc6fv1rgcjqds085b9fq074panc5vw582bcb8dbfzsrqxc"; - }; - } - { - goPackagePath = "github.com/linuxdeepin/go-x11-client"; - fetch = { - type = "git"; - url = "https://github.com/linuxdeepin/go-x11-client"; - rev = "b5b01565d224d5ccd5a4143d9099acceb23e182a"; - sha256 = "1lnffjp8bqy6f8caw6drg1js6hny5w7432riqchcrcd4q85d94rs"; - }; - } - { - goPackagePath = "github.com/nfnt/resize"; - fetch = { - type = "git"; - url = "https://github.com/nfnt/resize"; - rev = "83c6a9932646f83e3267f353373d47347b6036b2"; - sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya"; - }; - } - { - goPackagePath = "golang.org/x/image"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/image"; - rev = "e7c1f5e7dbb87d8921928a6d9fc52fb31ce73b24"; - sha256 = "0czp897aicqw1dgybj0hc2zzwb20rhqkdqm7siqci3yk7yk9cymf"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "daa7c04131f568e31c51927b359a2d197a357058"; - sha256 = "17gbfvb5iqyayzw0zd6q218zsbf7x74rflvn18wkxvsw95n1y54h"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } -] diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix deleted file mode 100644 index 094f3447c6b..00000000000 --- a/pkgs/desktops/deepin/dde-calendar/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, cmake -, qttools -, deepin-gettext-tools -, dtkcore -, dtkwidget -, deepin -}: - -mkDerivation rec { - pname = "dde-calendar"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1zzr3crkz4l5l135y0m53vqhv7fkrbvbspk8295swz9gsm3f7ah9"; - }; - - nativeBuildInputs = [ - cmake - pkgconfig - qttools - deepin-gettext-tools - deepin.setupHook - ]; - - buildInputs = [ - dtkcore - dtkwidget - ]; - - postPatch = '' - searchHardCodedPaths - patchShebangs translate_generation.sh - patchShebangs translate_desktop.sh - - fixPath $out /usr com.deepin.Calendar.service - - sed -i translate_desktop.sh \ - -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert," - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Calendar for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-calendar"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix deleted file mode 100644 index 850e39b9367..00000000000 --- a/pkgs/desktops/deepin/dde-control-center/default.nix +++ /dev/null @@ -1,150 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, cmake -, deepin -, qttools -, qtdeclarative -, networkmanager -, qtsvg -, qtx11extras -, dtkcore -, dtkwidget -, geoip -, gsettings-qt -, dde-network-utils -, networkmanager-qt -, xorg -, mtdev -, fontconfig -, freetype -, dde-api -, dde-daemon -, qt5integration -, deepin-desktop-base -, deepin-desktop-schemas -, dbus -, systemd -, dde-qt-dbus-factory -, qtmultimedia -, qtbase -, glib -, gnome3 -, which -, substituteAll -, tzdata -, wrapGAppsHook -}: - -mkDerivation rec { - pname = "dde-control-center"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "10bx8bpvi3ib32a3l4nyb1j0iq3bch8jm9wfm6d5v0ym1zb92x3b"; - }; - - nativeBuildInputs = [ - cmake - deepin.setupHook - pkgconfig - wrapGAppsHook - ]; - - buildInputs = [ - dde-api - dde-daemon - dde-network-utils - dde-qt-dbus-factory - deepin-desktop-base - deepin-desktop-schemas - dtkcore - dtkwidget - fontconfig - freetype - geoip - glib - gnome3.networkmanager-l2tp - gnome3.networkmanager-openconnect - gnome3.networkmanager-openvpn - gnome3.networkmanager-vpnc - gsettings-qt - mtdev - networkmanager-qt - qt5integration - qtbase - qtdeclarative - qtmultimedia - qtsvg - qttools - qtx11extras - xorg.libX11 - xorg.libXext - xorg.libXrandr - xorg.libxcb - ]; - - cmakeFlags = [ - "-DDISABLE_SYS_UPDATE=YES" - "-DDCC_DISABLE_GRUB=YES" - ]; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - nmcli = "${networkmanager}/bin/nmcli"; - which = "${which}/bin/which"; - # not packaged - # dman = "${deepin-manual}/bin/dman"; - inherit tzdata; - # exclusive to deepin linux? - # allows to synchronize configuration files to cloud networks - # deepin_sync = "${deepin-sync}"; - }) - ]; - - postPatch = '' - searchHardCodedPaths - - patchShebangs translate_ts2desktop.sh - patchShebangs translate_generation.sh - patchShebangs translate_desktop2ts.sh - - fixPath $out /usr dde-control-center-autostart.desktop \ - com.deepin.dde.ControlCenter.service \ - src/frame/widgets/utils.h - - substituteInPlace dde-control-center.desktop \ - --replace "dbus-send" "${dbus}/bin/dbus-send" - substituteInPlace com.deepin.controlcenter.addomain.policy \ - --replace "/bin/systemctl" "/run/current-system/sw/bin/systemctl" - ''; - - dontWrapQtApps = true; - - preFixup = '' - gappsWrapperArgs+=( - "''${qtWrapperArgs[@]}" - ) - ''; - - postFixup = '' - # debuging - searchForUnresolvedDLL $out - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Control panel of Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-control-center"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo worldofpeace ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-control-center/fix-paths.patch b/pkgs/desktops/deepin/dde-control-center/fix-paths.patch deleted file mode 100644 index 2c6e204d343..00000000000 --- a/pkgs/desktops/deepin/dde-control-center/fix-paths.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/src/frame/frame.cpp b/src/frame/frame.cpp -index 90d06f8..7cdad04 100644 ---- a/src/frame/frame.cpp -+++ b/src/frame/frame.cpp -@@ -375,7 +375,7 @@ void Frame::keyPressEvent(QKeyEvent *e) - #ifdef QT_DEBUG - case Qt::Key_Escape: qApp->quit(); break; - #endif -- case Qt::Key_F1: QProcess::startDetached("dman", QStringList("dde")); break; -+ case Qt::Key_F1: QProcess::startDetached("@dman@", QStringList("dde")); break; - default:; - } - } -diff --git a/src/frame/modules/datetime/timezone_dialog/timezone.cpp b/src/frame/modules/datetime/timezone_dialog/timezone.cpp -index 3dd4aad..5f1b363 100644 ---- a/src/frame/modules/datetime/timezone_dialog/timezone.cpp -+++ b/src/frame/modules/datetime/timezone_dialog/timezone.cpp -@@ -46,7 +46,7 @@ namespace installer { - namespace { - - // Absolute path to zone.tab file. --const char kZoneTabFile[] = "/usr/share/zoneinfo/zone.tab"; -+const char kZoneTabFile[] = "@tzdata@/share/zoneinfo/zone.tab"; - - // Absolute path to backward timezone file. - const char kTimezoneAliasFile[] = "/timezone_alias"; -diff --git a/src/frame/modules/network/connectionvpneditpage.cpp b/src/frame/modules/network/connectionvpneditpage.cpp -index e292865..95c5a2b 100644 ---- a/src/frame/modules/network/connectionvpneditpage.cpp -+++ b/src/frame/modules/network/connectionvpneditpage.cpp -@@ -215,7 +215,7 @@ void ConnectionVpnEditPage::exportConnConfig() - qDebug() << Q_FUNC_INFO << args; - - QProcess p; -- p.start("nmcli", args); -+ p.start("@nmcli@", args); - p.waitForFinished(); - qDebug() << p.readAllStandardOutput(); - qDebug() << p.readAllStandardError(); -diff --git a/src/frame/modules/network/vpnpage.cpp b/src/frame/modules/network/vpnpage.cpp -index 521a603..450d1a6 100644 ---- a/src/frame/modules/network/vpnpage.cpp -+++ b/src/frame/modules/network/vpnpage.cpp -@@ -224,7 +224,7 @@ void VpnPage::importVPN() - qDebug() << args; - - QProcess p; -- p.start("nmcli", args); -+ p.start("@nmcli@", args); - p.waitForFinished(); - const auto stat = p.exitCode(); - const QString output = p.readAllStandardOutput(); -diff --git a/src/frame/modules/sync/syncworker.cpp b/src/frame/modules/sync/syncworker.cpp -index 3f929bf..6f240d9 100644 ---- a/src/frame/modules/sync/syncworker.cpp -+++ b/src/frame/modules/sync/syncworker.cpp -@@ -24,7 +24,7 @@ SyncWorker::SyncWorker(SyncModel *model, QObject *parent) - - m_model->setSyncIsValid( - QProcess::execute( -- "which", QStringList() << "/usr/lib/deepin-sync-daemon/deepin-sync-daemon") == -+ "@which@", QStringList() << "@deepin_sync@/lib/deepin-sync-daemon/deepin-sync-daemon") == - 0 && - valueByQSettings(DCC_CONFIG_FILES, "CloudSync", "AllowCloudSync", false)); - } diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix deleted file mode 100644 index c4edcef15af..00000000000 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ /dev/null @@ -1,159 +0,0 @@ -{ stdenv -, buildGoPackage -, fetchFromGitHub -, fetchpatch -, pkgconfig -, go-dbus-factory -, go-gir-generator -, go-lib -, deepin-gettext-tools -, gettext -, dde-api -, deepin-desktop-schemas -, deepin-wallpapers -, deepin-desktop-base -, alsaLib -, glib -, gtk3 -, libgudev -, libinput -, libnl -, librsvg -, linux-pam -, networkmanager -, pulseaudio -, python3 -, hicolor-icon-theme -, glibc -, tzdata -, go -, deepin -, makeWrapper -, xkeyboard_config -, wrapGAppsHook -}: - -buildGoPackage rec { - pname = "dde-daemon"; - version = "5.0.0"; - - goPackagePath = "pkg.deepin.io/dde/daemon"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "08jri31bvzbaxaq78rpp46ndv0li2dij63hakvd9b9gs786srql1"; - }; - - patches = [ - # https://github.com/linuxdeepin/dde-daemon/issues/51 - (fetchpatch { - url = "https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.8.0.patch"; - sha256 = "1ampdsp9zlg263flswdw9gj10n7gxh7zi6w6z9jgh29xlai05pvh"; - }) - ]; - - goDeps = ./deps.nix; - - nativeBuildInputs = [ - pkgconfig - deepin-gettext-tools - gettext - networkmanager - networkmanager.dev - python3 - makeWrapper - wrapGAppsHook - deepin.setupHook - ]; - - buildInputs = [ - go-dbus-factory - go-gir-generator - go-lib - linux-pam - - alsaLib - dde-api - deepin-desktop-base - deepin-desktop-schemas - deepin-wallpapers - glib - libgudev - gtk3 - hicolor-icon-theme - libinput - libnl - librsvg - pulseaudio - tzdata - xkeyboard_config - ]; - - postPatch = '' - searchHardCodedPaths # debugging - patchShebangs network/nm_generator/gen_nm_consts.py - - fixPath $out /usr/share/dde/data launcher/manager.go dock/dock_manager_init.go - fixPath $out /usr/share/dde-daemon launcher/manager.go gesture/config.go - fixPath ${networkmanager.dev} /usr/share/gir-1.0/NM-1.0.gir network/nm_generator/Makefile - fixPath ${glibc.bin} /usr/bin/getconf systeminfo/utils.go - fixPath ${deepin-desktop-base} /etc/deepin-version systeminfo/version.go accounts/deepinversion.go - fixPath ${tzdata} /usr/share/zoneinfo timedate/zoneinfo/zone.go - fixPath ${dde-api} /usr/lib/deepin-api grub2/modify_manger.go accounts/image_blur.go - fixPath ${deepin-wallpapers} /usr/share/wallpapers appearance/background/list.go accounts/user.go - fixPath ${xkeyboard_config} /usr/share/X11/xkb inputdevices/layout_list.go - - # TODO: deepin-system-monitor comes from dde-extra - - sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile - sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile - sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile - - find -type f -exec sed -i -e "s,/usr/lib/deepin-daemon,$out/lib/deepin-daemon," {} + - - # This package wants to install polkit local authority files into - # /var/lib. Nix does not allow a package to install files into /var/lib - # because it is outside of the Nix store and should contain applications - # state information (persistent data modified by programs as they - # run). Polkit looks for them in both /etc/polkit-1 and - # /var/lib/polkit-1 (with /etc having priority over /var/lib). An - # work around is to install them to $out/etc and simlnk them to - # /etc in the deepin module. - - sed -i -e "s,/var/lib/polkit-1,/etc/polkit-1," Makefile - ''; - - buildPhase = '' - export PAM_MODULE_DIR="$out/lib/security" - # compilation of the nm module is failing - #make -C go/src/${goPackagePath}/network/nm_generator gen-nm-code - make -C go/src/${goPackagePath} - ''; - - installPhase = '' - make install PREFIX="$out" -C go/src/${goPackagePath} - remove-references-to -t ${go} $out/lib/deepin-daemon/* - searchHardCodedPaths $out - ''; - - postFixup = '' - # wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec - for binary in $out/lib/deepin-daemon/*; do - wrapGApp "$binary" - done - - searchHardCodedPaths $out # debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Daemon for handling Deepin Desktop Environment session settings"; - homepage = "https://github.com/linuxdeepin/dde-daemon"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-daemon/deps.nix b/pkgs/desktops/deepin/dde-daemon/deps.nix deleted file mode 100644 index bcc5ab81808..00000000000 --- a/pkgs/desktops/deepin/dde-daemon/deps.nix +++ /dev/null @@ -1,111 +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 = "fb15b899a75114aa79cc930e33c46b577cc664b1"; - sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "f65c72e2690dc4b403c8bd637baf4611cd4c069b"; - sha256 = "04jyqm7m3m01ppfy1f9xk4qvrwvs78q9zml6llyf2b3v5k6b2bbc"; - }; - } - { - goPackagePath = "github.com/axgle/mahonia"; - fetch = { - type = "git"; - url = "https://github.com/axgle/mahonia"; - rev = "3358181d7394e26beccfae0ffde05193ef3be33a"; - sha256 = "0b8wsrxmv8a0cqbnsg55lpf29pxy2zw8azvgh3ck664lqpcfybhq"; - }; - } - { - goPackagePath = "github.com/cryptix/wav"; - fetch = { - type = "git"; - url = "https://github.com/cryptix/wav"; - rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44"; - sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6"; - }; - } - { - goPackagePath = "github.com/gosexy/gettext"; - fetch = { - type = "git"; - url = "https://github.com/gosexy/gettext"; - rev = "74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b"; - sha256 = "0asphx8nd7zmp88wk6aakk5292np7yw73akvfdvlvs9q5r5ahkgi"; - }; - } - { - goPackagePath = "github.com/linuxdeepin/go-x11-client"; - fetch = { - type = "git"; - url = "https://github.com/linuxdeepin/go-x11-client"; - rev = "b5b01565d224d5ccd5a4143d9099acceb23e182a"; - sha256 = "1lnffjp8bqy6f8caw6drg1js6hny5w7432riqchcrcd4q85d94rs"; - }; - } - { - goPackagePath = "github.com/msteinert/pam"; - fetch = { - type = "git"; - url = "https://github.com/msteinert/pam"; - rev = "f29b9f28d6f9a1f6c4e6fd5db731999eb946574b"; - sha256 = "1v5z51mgyz2glm7v0mg60xs1as88wx6cqhys2khc5d3khkr8q0qp"; - }; - } - { - goPackagePath = "github.com/nfnt/resize"; - fetch = { - type = "git"; - url = "https://github.com/nfnt/resize"; - rev = "83c6a9932646f83e3267f353373d47347b6036b2"; - sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya"; - }; - } - { - goPackagePath = "golang.org/x/image"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/image"; - rev = "e7c1f5e7dbb87d8921928a6d9fc52fb31ce73b24"; - sha256 = "0czp897aicqw1dgybj0hc2zzwb20rhqkdqm7siqci3yk7yk9cymf"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "daa7c04131f568e31c51927b359a2d197a357058"; - sha256 = "17gbfvb5iqyayzw0zd6q218zsbf7x74rflvn18wkxvsw95n1y54h"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "4b67af870c6ffd08258ef1202f371aebccaf7b68"; - sha256 = "01mhy1xs2dh18kp6wdk1xnb34lbzv2qkvdwj7w5ha2qgm5rrm4ik"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } -] diff --git a/pkgs/desktops/deepin/dde-dock/dde-dock.plugins-dir.patch b/pkgs/desktops/deepin/dde-dock/dde-dock.plugins-dir.patch deleted file mode 100644 index 87b76045b43..00000000000 --- a/pkgs/desktops/deepin/dde-dock/dde-dock.plugins-dir.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c48867b73485b34b95f14e9b9bbb54507fc77648 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= -Date: Fri, 19 Apr 2019 18:21:49 -0300 -Subject: [PATCH] Use an environment variable for the plugins directory - ---- - frame/controller/dockpluginscontroller.cpp | 2 +- - plugins/tray/system-trays/systemtrayscontroller.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/frame/controller/dockpluginscontroller.cpp b/frame/controller/dockpluginscontroller.cpp -index 32a5885..efd53c8 100644 ---- a/frame/controller/dockpluginscontroller.cpp -+++ b/frame/controller/dockpluginscontroller.cpp -@@ -126,7 +126,7 @@ void DockPluginsController::startLoader() - { - QString pluginsDir("../plugins"); - if (!QDir(pluginsDir).exists()) { -- pluginsDir = "/usr/lib/dde-dock/plugins"; -+ pluginsDir = QProcessEnvironment::systemEnvironment().value("DDE_DOCK_PLUGINS_DIR", "@out@/lib/dde-dock/plugins"); - } - qDebug() << "using dock plugins dir:" << pluginsDir; - -diff --git a/plugins/tray/system-trays/systemtrayscontroller.cpp b/plugins/tray/system-trays/systemtrayscontroller.cpp -index 0c8ca88..7c47d25 100644 ---- a/plugins/tray/system-trays/systemtrayscontroller.cpp -+++ b/plugins/tray/system-trays/systemtrayscontroller.cpp -@@ -159,7 +159,7 @@ void SystemTraysController::startLoader() - { - QString pluginsDir("../plugins/system-trays"); - if (!QDir(pluginsDir).exists()) { -- pluginsDir = "/usr/lib/dde-dock/plugins/system-trays"; -+ pluginsDir = QProcessEnvironment::systemEnvironment().value("DDE_DOCK_PLUGINS_DIR", "@out@/lib/dde-dock/plugins") + "/system-trays"; - } - qDebug() << "using system tray plugins dir:" << pluginsDir; - --- -2.21.0 - diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix deleted file mode 100644 index 68f2caa6319..00000000000 --- a/pkgs/desktops/deepin/dde-dock/default.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, cmake -, pkgconfig -, qttools -, qtx11extras -, qtsvg -, polkit -, gsettings-qt -, dtkcore -, dtkwidget -, dde-qt-dbus-factory -, dde-network-utils -, dde-daemon -, deepin-desktop-schemas -, xorg -, glib -, wrapGAppsHook -, deepin -, plugins ? [ ] -, symlinkJoin -, makeWrapper -, libdbusmenu -}: - -let - unwrapped = mkDerivation rec { - pname = "dde-dock"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "12dshsqhzajnxm7r53qg0c84b6xlj313qnssnx2m25z4jdp5i7pr"; - }; - - nativeBuildInputs = [ - cmake - pkgconfig - qttools - wrapGAppsHook - deepin.setupHook - ]; - - buildInputs = [ - dde-daemon - dde-network-utils - dde-qt-dbus-factory - deepin-desktop-schemas - dtkcore - dtkwidget - glib - gsettings-qt - libdbusmenu - polkit - qtsvg - qtx11extras - xorg.libXdmcp - xorg.libXtst - xorg.libpthreadstubs - ]; - - patches = [ - ./dde-dock.plugins-dir.patch - ]; - - postPatch = '' - searchHardCodedPaths - patchShebangs translate_generation.sh - fixPath $out /etc/dde-dock plugins/keyboard-layout/CMakeLists.txt - fixPath $out /usr cmake/DdeDock/DdeDockConfig.cmake - fixPath $out /usr dde-dock.pc - fixPath $out /usr/bin/dde-dock frame/com.deepin.dde.Dock.service - fixPath $out /usr/share/dbus-1 CMakeLists.txt - fixPath ${dde-daemon} /usr/lib/deepin-daemon frame/item/showdesktopitem.cpp - fixPath ${dde-network-utils} /usr/share/dde-network-utils frame/main.cpp - fixPath ${polkit} /usr/bin/pkexec plugins/overlay-warning/overlay-warning-plugin.cpp - - substituteInPlace frame/controller/dockpluginscontroller.cpp --subst-var-by out $out - substituteInPlace plugins/tray/system-trays/systemtrayscontroller.cpp --subst-var-by out $out - ''; - - cmakeFlags = [ "-DDOCK_TRAY_USE_NATIVE_POPUP=YES" ]; - - dontWrapQtApps = true; - - preFixup = '' - gappsWrapperArgs+=( - "''${qtWrapperArgs[@]}" - ) - ''; - - postFixup = '' - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Dock for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-dock"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; - }; - -in -if plugins == [ ] -then unwrapped -else import ./wrapper.nix { - inherit makeWrapper symlinkJoin plugins; - dde-dock = unwrapped; -} diff --git a/pkgs/desktops/deepin/dde-dock/wrapper.nix b/pkgs/desktops/deepin/dde-dock/wrapper.nix deleted file mode 100644 index 1690230a99e..00000000000 --- a/pkgs/desktops/deepin/dde-dock/wrapper.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ makeWrapper -, symlinkJoin -, dde-dock -, plugins -}: - -symlinkJoin { - name = "dde-dock-with-plugins-${dde-dock.version}"; - - paths = [ dde-dock ] ++ plugins; - - buildInputs = [ makeWrapper ]; - - postBuild = '' - wrapProgram $out/bin/dde-dock \ - --set DDE_DOCK_PLUGINS_DIR "$out/lib/dde-dock/plugins" - - rm $out/share/dbus-1/services/com.deepin.dde.Dock.service - - substitute ${dde-dock}/share/dbus-1/services/com.deepin.dde.Dock.service $out/share/dbus-1/services/com.deepin.dde.Dock.service \ - --replace ${dde-dock} $out - ''; - - inherit (dde-dock) meta; -} diff --git a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch b/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch deleted file mode 100644 index 253a67b04ec..00000000000 --- a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch +++ /dev/null @@ -1,323 +0,0 @@ -From 29f4ad88e2294ae70b10180e7361d135c4e5c896 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= -Date: Mon, 13 May 2019 00:09:42 -0300 -Subject: [PATCH 2/2] Use XDG to look for mime cache - ---- - .../shutil/mimesappsmanager.cpp | 230 ++++++++++-------- - .../shutil/mimesappsmanager.h | 6 +- - 2 files changed, 125 insertions(+), 111 deletions(-) - -diff --git a/dde-file-manager-lib/shutil/mimesappsmanager.cpp b/dde-file-manager-lib/shutil/mimesappsmanager.cpp -index c9e53630..7a21df51 100644 ---- a/dde-file-manager-lib/shutil/mimesappsmanager.cpp -+++ b/dde-file-manager-lib/shutil/mimesappsmanager.cpp -@@ -552,14 +552,20 @@ QString MimesAppsManager::getMimeAppsCacheFile() - return QString("%1/%2").arg(DFMStandardPaths::location(DFMStandardPaths::CachePath), "MimeApps.json"); - } - --QString MimesAppsManager::getMimeInfoCacheFilePath() -+QStringList MimesAppsManager::getMimeInfoCacheFilePath() - { -- return "/usr/share/applications/mimeinfo.cache"; -+ QStringList paths; -+ for (const QString dir : getMimeInfoCacheFileRootPath() ) -+ paths.append(dir + QDir::separator() + "mimeinfo.cache"); -+ qDebug() << "getMimeInfoCacheFilePath: " << paths; -+ return paths; - } - --QString MimesAppsManager::getMimeInfoCacheFileRootPath() -+QStringList MimesAppsManager::getMimeInfoCacheFileRootPath() - { -- return "/usr/share/applications"; -+ QStringList paths = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); -+ qDebug() << "getMimeInfoCacheFileRootPath: " << paths; -+ return paths; - } - - QString MimesAppsManager::getDesktopFilesCacheFile() -@@ -574,23 +580,27 @@ QString MimesAppsManager::getDesktopIconsCacheFile() - - QStringList MimesAppsManager::getDesktopFiles() - { -- QStringList desktopFiles; -+ QStringList desktopFiles; - -- foreach (QString desktopFolder, getApplicationsFolders()) { -- QDirIterator it(desktopFolder, QStringList("*.desktop"), -- QDir::Files | QDir::NoDotAndDotDot, -- QDirIterator::Subdirectories); -- while (it.hasNext()) { -- it.next(); -- desktopFiles.append(it.filePath()); -- } -- } -- return desktopFiles; -+ foreach (QString desktopFolder, getApplicationsFolders()) { -+ QDirIterator it(desktopFolder, QStringList("*.desktop"), -+ QDir::Files | QDir::NoDotAndDotDot, -+ QDirIterator::Subdirectories); -+ while (it.hasNext()) { -+ it.next(); -+ desktopFiles.append(it.filePath()); -+ } -+ } -+ return desktopFiles; - } - --QString MimesAppsManager::getDDEMimeTypeFile() -+QStringList MimesAppsManager::getDDEMimeTypeFile() - { -- return QString("%1/%2/%3").arg(getMimeInfoCacheFileRootPath(), "deepin", "dde-mimetype.list"); -+ QStringList paths; -+ for (const QString path : getMimeInfoCacheFileRootPath()) -+ paths.append(QString("%1/%2/%3").arg(path, "deepin", "dde-mimetype.list")); -+ qDebug() << "getDDEMimeTypeFile: " << paths; -+ return paths; - } - - QMap MimesAppsManager::getDesktopObjs() -@@ -663,124 +673,128 @@ void MimesAppsManager::initMimeTypeApps() - MimeApps.insert(key, orderApps); - } - -- //check mime apps from cache -- QFile f(getMimeInfoCacheFilePath()); -- if(!f.open(QIODevice::ReadOnly)){ -- qDebug () << "failed to read mime info cache file:" << f.errorString(); -- return; -- } -- - QStringList audioDesktopList; - QStringList imageDeksopList; - QStringList textDekstopList; - QStringList videoDesktopList; - -- while (!f.atEnd()) { -- QString data = f.readLine(); -- QString _desktops = data.split("=").last(); -- QString mimeType = data.split("=").first(); -- QStringList desktops = _desktops.split(";"); -- -- foreach (const QString desktop, desktops) { -- if(desktop.isEmpty() || audioDesktopList.contains(desktop)) -- continue; -+ //check mime apps from cache -+ for (const QString path : getMimeInfoCacheFilePath()) { -+ QFile f(path); -+ if(!f.open(QIODevice::ReadOnly)){ -+ qDebug () << "failed to read mime info cache file:" << f.errorString(); -+ return; -+ } - -- if(mimeType.startsWith("audio")){ -- if(!audioDesktopList.contains(desktop)) -- audioDesktopList << desktop; -- } else if(mimeType.startsWith("image")){ -- if(!imageDeksopList.contains(desktop)) -- imageDeksopList << desktop; -- } else if(mimeType.startsWith("text")){ -- if(!textDekstopList.contains(desktop)) -- textDekstopList << desktop; -- } else if(mimeType.startsWith("video")){ -- if(!videoDesktopList.contains(desktop)) -- videoDesktopList << desktop; -+ while (!f.atEnd()) { -+ QString data = f.readLine(); -+ QString _desktops = data.split("=").last(); -+ QString mimeType = data.split("=").first(); -+ QStringList desktops = _desktops.split(";"); -+ -+ foreach (const QString desktop, desktops) { -+ if(desktop.isEmpty() || audioDesktopList.contains(desktop)) -+ continue; -+ -+ if(mimeType.startsWith("audio")){ -+ if(!audioDesktopList.contains(desktop)) -+ audioDesktopList << desktop; -+ } else if(mimeType.startsWith("image")){ -+ if(!imageDeksopList.contains(desktop)) -+ imageDeksopList << desktop; -+ } else if(mimeType.startsWith("text")){ -+ if(!textDekstopList.contains(desktop)) -+ textDekstopList << desktop; -+ } else if(mimeType.startsWith("video")){ -+ if(!videoDesktopList.contains(desktop)) -+ videoDesktopList << desktop; -+ } - } - } -+ f.close(); - } -- f.close(); - -- const QString mimeInfoCacheRootPath = getMimeInfoCacheFileRootPath(); -- foreach (QString desktop, audioDesktopList) { -- const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -- if(!QFile::exists(path)) -- continue; -- DesktopFile df(path); -- AudioMimeApps.insert(path, df); -- } -+ for (const QString mimeInfoCacheRootPath : getMimeInfoCacheFileRootPath()) { -+ foreach (QString desktop, audioDesktopList) { -+ const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -+ if(!QFile::exists(path)) -+ continue; -+ DesktopFile df(path); -+ AudioMimeApps.insert(path, df); -+ } - -- foreach (QString desktop, imageDeksopList) { -- const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -- if(!QFile::exists(path)) -- continue; -- DesktopFile df(path); -- ImageMimeApps.insert(path, df); -- } -+ foreach (QString desktop, imageDeksopList) { -+ const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -+ if(!QFile::exists(path)) -+ continue; -+ DesktopFile df(path); -+ ImageMimeApps.insert(path, df); -+ } - -- foreach (QString desktop, textDekstopList) { -- const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -- if(!QFile::exists(path)) -- continue; -- DesktopFile df(path); -- TextMimeApps.insert(path, df); -- } -+ foreach (QString desktop, textDekstopList) { -+ const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -+ if(!QFile::exists(path)) -+ continue; -+ DesktopFile df(path); -+ TextMimeApps.insert(path, df); -+ } - -- foreach (QString desktop, videoDesktopList) { -- const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -- if(!QFile::exists(path)) -- continue; -- DesktopFile df(path); -- VideoMimeApps.insert(path, df); -+ foreach (QString desktop, videoDesktopList) { -+ const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -+ if(!QFile::exists(path)) -+ continue; -+ DesktopFile df(path); -+ VideoMimeApps.insert(path, df); -+ } - } -- - return; - } - - void MimesAppsManager::loadDDEMimeTypes() - { -- QSettings settings(getDDEMimeTypeFile(), QSettings::IniFormat); -- qDebug() << settings.childGroups(); -+ for (const QString path : getDDEMimeTypeFile()) { -+ QSettings settings(path, QSettings::IniFormat); -+ qDebug() << settings.childGroups(); - -- QFile file(getDDEMimeTypeFile()); -- if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { -- return; -- } -+ QFile file(path); -+ if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { -+ continue; -+ } -+ -+ // Read propeties -+ QTextStream in(&file); -+ QString desktopKey; -+ while (!in.atEnd()) { - -- // Read propeties -- QTextStream in(&file); -- QString desktopKey; -- while (!in.atEnd()) { -+ // Read new line -+ QString line = in.readLine(); - -- // Read new line -- QString line = in.readLine(); -+ // Skip empty line or line with invalid format -+ if (line.trimmed().isEmpty()) { -+ continue; -+ } - -- // Skip empty line or line with invalid format -- if (line.trimmed().isEmpty()) { -- continue; -- } -+ // Read group -+ // NOTE: symbols '[' and ']' can be found not only in group names, but -+ // only group can start with '[' - -- // Read group -- // NOTE: symbols '[' and ']' can be found not only in group names, but -- // only group can start with '[' -+ if (line.trimmed().startsWith("[") && line.trimmed().endsWith("]")) { -+ QString tmp = line.trimmed().replace("[", "").replace("]", ""); -+ desktopKey = tmp; -+ continue; -+ } - -- if (line.trimmed().startsWith("[") && line.trimmed().endsWith("]")) { -- QString tmp = line.trimmed().replace("[", "").replace("]", ""); -- desktopKey = tmp; -- continue; -- } -- -- // If we are in correct group and line contains assignment then read data -- int first_equal = line.indexOf('='); -- if (!desktopKey.isEmpty() && first_equal >= 0) { -- QString value = line.mid(first_equal + 1); -- QStringList mimetypes = value.split(";"); -- DDE_MimeTypes.insert(desktopKey, mimetypes); -- desktopKey.clear(); -+ // If we are in correct group and line contains assignment then read data -+ int first_equal = line.indexOf('='); -+ if (!desktopKey.isEmpty() && first_equal >= 0) { -+ QString value = line.mid(first_equal + 1); -+ QStringList mimetypes = value.split(";"); -+ DDE_MimeTypes.insert(desktopKey, mimetypes); -+ desktopKey.clear(); -+ } - } -+ file.close(); - } -- file.close(); - } - - bool MimesAppsManager::lessByDateTime(const QFileInfo &f1, const QFileInfo &f2) -diff --git a/dde-file-manager-lib/shutil/mimesappsmanager.h b/dde-file-manager-lib/shutil/mimesappsmanager.h -index 223c80aa..00a61302 100644 ---- a/dde-file-manager-lib/shutil/mimesappsmanager.h -+++ b/dde-file-manager-lib/shutil/mimesappsmanager.h -@@ -101,12 +101,12 @@ public: - - static QStringList getApplicationsFolders(); - static QString getMimeAppsCacheFile(); -- static QString getMimeInfoCacheFilePath(); -- static QString getMimeInfoCacheFileRootPath(); -+ static QStringList getMimeInfoCacheFilePath(); -+ static QStringList getMimeInfoCacheFileRootPath(); - static QString getDesktopFilesCacheFile(); - static QString getDesktopIconsCacheFile(); - static QStringList getDesktopFiles(); -- static QString getDDEMimeTypeFile(); -+ static QStringList getDDEMimeTypeFile(); - static QMap getDesktopObjs(); - static void initMimeTypeApps(); - static void loadDDEMimeTypes(); --- -2.21.0 - diff --git a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch b/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch deleted file mode 100644 index 3ced15e7e5a..00000000000 --- a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch +++ /dev/null @@ -1,89 +0,0 @@ -From e68d983a6befd223087916cb3fe31baee77decc4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= -Date: Sun, 12 May 2019 08:50:07 -0300 -Subject: [PATCH 1/2] Use qt library to determine where to look for application - files - ---- - dde-file-manager-lib/shutil/fileutils.cpp | 34 ++++++++++++------- - .../shutil/mimesappsmanager.cpp | 11 ++---- - 2 files changed, 25 insertions(+), 20 deletions(-) - -diff --git a/dde-file-manager-lib/shutil/fileutils.cpp b/dde-file-manager-lib/shutil/fileutils.cpp -index ae8120d3..d6a0573a 100644 ---- a/dde-file-manager-lib/shutil/fileutils.cpp -+++ b/dde-file-manager-lib/shutil/fileutils.cpp -@@ -242,13 +242,19 @@ bool FileUtils::isArchive(const QString &path) - */ - QStringList FileUtils::getApplicationNames() { - QStringList appNames; -- QDirIterator it("/usr/share/applications", QStringList("*.desktop"), -- QDir::Files | QDir::NoDotAndDotDot, -- QDirIterator::Subdirectories); -- while (it.hasNext()) { -- it.next(); -- appNames.append(it.fileName()); -+ -+ const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); -+ qDebug() << "dde-file-manager getApplicationNames desktopDirs:" << desktopDirs; -+ for (const QString &dir : desktopDirs) { -+ QDirIterator it(dir, QStringList("*.desktop"), -+ QDir::Files | QDir::NoDotAndDotDot, -+ QDirIterator::Subdirectories); -+ while (it.hasNext()) { -+ it.next(); -+ appNames.append(it.fileName()); -+ } - } -+ - return appNames; - } - //--------------------------------------------------------------------------- -@@ -259,12 +265,16 @@ QStringList FileUtils::getApplicationNames() { - */ - QList FileUtils::getApplications() { - QList apps; -- QDirIterator it("/usr/share/applications", QStringList("*.desktop"), -- QDir::Files | QDir::NoDotAndDotDot, -- QDirIterator::Subdirectories); -- while (it.hasNext()) { -- it.next(); -- apps.append(DesktopFile(it.filePath())); -+ const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); -+ qDebug() << "dde-file-manager getApplications desktopDirs:" << desktopDirs; -+ for (const QString &dir : desktopDirs) { -+ QDirIterator it(dir, QStringList("*.desktop"), -+ QDir::Files | QDir::NoDotAndDotDot, -+ QDirIterator::Subdirectories); -+ while (it.hasNext()) { -+ it.next(); -+ apps.append(DesktopFile(it.filePath())); -+ } - } - return apps; - } -diff --git a/dde-file-manager-lib/shutil/mimesappsmanager.cpp b/dde-file-manager-lib/shutil/mimesappsmanager.cpp -index c6149702..c9e53630 100644 ---- a/dde-file-manager-lib/shutil/mimesappsmanager.cpp -+++ b/dde-file-manager-lib/shutil/mimesappsmanager.cpp -@@ -542,14 +542,9 @@ QStringList MimesAppsManager::getrecommendedAppsFromMimeWhiteList(const DUrl &ur - - QStringList MimesAppsManager::getApplicationsFolders() - { -- QStringList desktopFolders; -- desktopFolders << QString("/usr/share/applications/") -- << QString("/usr/local/share/applications/") -- << QString("/usr/share/gnome/applications/") -- << QString("/var/lib/flatpak/exports/share/applications") -- << QDir::homePath() + QString("/.local/share/flatpak/exports/share/applications") -- << QDir::homePath() + QString( "/.local/share/applications" ); -- return desktopFolders; -+ QStringList paths = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); -+ qDebug() << "dde-file-manager getApplicationsFolders:" << paths; -+ return paths; - } - - QString MimesAppsManager::getMimeAppsCacheFile() --- -2.21.0 - diff --git a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch b/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch deleted file mode 100644 index 582760e6db2..00000000000 --- a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 084c3cfcf4995c109ca2e96f042fe341f925b0b4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= -Date: Thu, 16 May 2019 19:00:52 -0300 -Subject: [PATCH 4/4] Use xdg to look for pixmap icons - ---- - dde-file-manager-lib/shutil/fileutils.cpp | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -diff --git a/dde-file-manager-lib/shutil/fileutils.cpp b/dde-file-manager-lib/shutil/fileutils.cpp -index d6a0573a..e912e7c2 100644 ---- a/dde-file-manager-lib/shutil/fileutils.cpp -+++ b/dde-file-manager-lib/shutil/fileutils.cpp -@@ -362,11 +362,16 @@ QIcon FileUtils::searchAppIcon(const DesktopFile &app, - } - - // Last chance -- QDir appIcons("/usr/share/pixmaps","", 0, QDir::Files | QDir::NoDotAndDotDot); -- QStringList iconFiles = appIcons.entryList(); -- QStringList searchIcons = iconFiles.filter(name); -- if (searchIcons.count() > 0) { -- return QIcon("/usr/share/pixmaps/" + searchIcons.at(0)); -+ const QStringList dirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); -+ qDebug() << "searchAppIcon: last chance: look for pixmaps at: " << dirs; -+ for (const QString &dir : dirs) { -+ const QString path = dir + QDir::separator() + "pixmaps"; -+ QDir appIcons(path,"", 0, QDir::Files | QDir::NoDotAndDotDot); -+ QStringList iconFiles = appIcons.entryList(); -+ QStringList searchIcons = iconFiles.filter(name); -+ if (searchIcons.count() > 0) { -+ return QIcon(path + QDir::separator() + searchIcons.at(0)); -+ } - } - - // Default icon --- -2.21.0 - diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix deleted file mode 100644 index 4258e2aa859..00000000000 --- a/pkgs/desktops/deepin/dde-file-manager/default.nix +++ /dev/null @@ -1,298 +0,0 @@ -{ 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 = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0n2nl09anqdq0n5yn688n385rn81lcpybs0sa8m311k3k9ndkkyr"; - }; - - nativeBuildInputs = [ - deepin.setupHook - qmake - qttools - pkgconfig - deepin-gettext-tools - wrapGAppsHook - ]; - - buildInputs = [ - avfs - dde-daemon - dde-dock - dde-polkit-agent - dde-qt-dbus-factory - deepin-anything - deepin-desktop-schemas - deepin-movie-reborn.dev - deepin-shortcut-viewer - deepin-terminal - disomaster - dtkcore - dtkwidget - ffmpegthumbnailer - file - glib - gnugrep - gsettings-qt - gvfs - jemalloc - kcodecs - libsecret - polkit - polkit-qt - poppler - procps - qt5integration - qtmultimedia - qtsvg - qtx11extras - samba - taglib - udisks2-qt5 - xdg-user-dirs - xorg.libX11 - xorg.libxcb - xorg.xcbutil - xorg.xcbutilwm - xorg.xorgproto - zlib - ]; - - patches = [ - ./dde-file-manager.fix-paths.patch - ./dde-file-manager.fix-mime-cache-paths.patch - ./dde-file-manager.pixmaps-paths.patch - ]; - - postPatch = '' - searchHardCodedPaths - - patchShebangs dde-desktop/translate_generation.sh - patchShebangs dde-desktop/translate_ts2desktop.sh - patchShebangs dde-file-manager-lib/generate_translations.sh - patchShebangs dde-file-manager/generate_translations.sh - patchShebangs dde-file-manager/translate_ts2desktop.sh - patchShebangs usb-device-formatter/generate_translations.sh - patchShebangs usb-device-formatter/translate_ts2desktop.sh - - # x-terminal-emulator is a virtual package in Debian systems. The - # terminal emulator is configured by Debian's alternative system. - # It is not available on NixOS. Use deepin-terminal instead - sed -i -e "s,x-terminal-emulator,deepin-terminal," \ - dde-file-manager-lib/shutil/fileutils.cpp - - sed -i -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/lib," \ - dde-file-manager-lib/dde-file-manager-lib.pro \ - dde-file-thumbnail-tool/common.pri \ - common/common.pri - - sed -i '/^QMAKE_PKGCONFIG_DESTDIR/i QMAKE_PKGCONFIG_PREFIX = $$PREFIX' \ - dde-file-manager-lib/dde-file-manager-lib.pro - - fixPath ${dde-dock} /usr/include/dde-dock \ - dde-dock-plugins/disk-mount/disk-mount.pro - - # treefrog is not available in NixOS, and I am not sure if it is really needed - #fixPath $ {treefrog-framework} /usr/include/treefrog \ - # dde-sharefiles/appbase.pri - - fixPath ${deepin-anything} /usr/share/dbus-1/interfaces \ - dde-file-manager-lib/dbusinterface/dbusinterface.pri - - sed -i -e "s,\$\$system(\$\$PKG_CONFIG --variable libdir deepin-anything-server-lib),$out/lib," \ - deepin-anything-server-plugins/dde-anythingmonitor/dde-anythingmonitor.pro - - fixPath ${dde-daemon} /usr/lib/deepin-daemon/desktop-toggle \ - dde-zone/mainwindow.h - - fixPath ${deepin-gettext-tools} /usr/bin/deepin-desktop-ts-convert \ - dde-desktop/translate_desktop2ts.sh \ - dde-desktop/translate_ts2desktop.sh \ - dde-file-manager/translate_desktop2ts.sh \ - dde-file-manager/translate_ts2desktop.sh \ - usb-device-formatter/translate_desktop2ts.sh \ - usb-device-formatter/translate_ts2desktop.sh - - fixPath ${avfs} /usr/bin/mountavfs dde-file-manager-lib/shutil/fileutils.cpp - fixPath ${avfs} /usr/bin/umountavfs dde-file-manager-lib/shutil/fileutils.cpp - - fixPath ${deepin-terminal} /usr/bin/deepin-terminal \ - dde-file-manager-lib/shutil/fileutils.cpp - - fixPath $out /usr/share/dde-file-manager \ - dde-sharefiles/appbase.pri \ - dde-sharefiles/dde-sharefiles.pro - - fixPath $out /usr/share/usb-device-formatter \ - usb-device-formatter/main.cpp - - fixPath $out /usr/share/applications \ - dde-file-manager/mips/dde-file-manager-autostart.desktop \ - dde-desktop/development.pri - - fixPath $out /usr/bin \ - dbusservices/com.deepin.dde.desktop.service \ - dde-desktop/data/com.deepin.dde.desktop.service \ - dde-desktop/dbus/filedialog/com.deepin.filemanager.filedialog.service \ - dde-desktop/dbus/filemanager1/org.freedesktop.FileManager.service \ - dde-file-manager-daemon/dbusservice/com.deepin.filemanager.daemon.service \ - dde-file-manager-daemon/dbusservice/dde-filemanager-daemon.service \ - dde-file-manager-daemon/dde-file-manager-daemon.pro \ - dde-file-manager-lib/dde-file-manager-lib.pro \ - dde-file-manager-lib/pkexec/com.deepin.pkexec.dde-file-manager.policy \ - dde-file-manager/dde-file-manager-xdg-autostart.desktop \ - dde-file-manager/dde-file-manager.desktop \ - dde-file-manager/dde-file-manager.pro \ - dde-file-manager/mips/dde-file-manager-autostart.desktop \ - dde-file-manager/mips/dde-file-manager.desktop \ - dde-file-manager/pkexec/com.deepin.pkexec.dde-file-manager.policy \ - usb-device-formatter/pkexec/com.deepin.pkexec.usb-device-formatter.policy \ - usb-device-formatter/usb-device-formatter.desktop \ - usb-device-formatter/usb-device-formatter.pro - fixPath $out /etc \ - dde-file-manager/dde-file-manager.pro \ - dde-file-manager-daemon/dde-file-manager-daemon.pro - - fixPath $out /usr \ - common/common.pri \ - dde-desktop/dbus/filedialog/filedialog.pri \ - dde-desktop/dbus/filemanager1/filemanager1.pri \ - dde-desktop/development.pri \ - dde-dock-plugins/disk-mount/disk-mount.pro \ - dde-file-manager-daemon/dde-file-manager-daemon.pro \ - usb-device-formatter/usb-device-formatter.pro - - sed -i -e "s,xdg-user-dir,${xdg-user-dirs}/bin/xdg-user-dir," \ - dde-file-manager/dde-xdg-user-dirs-update - - sed -i -e "s,Exec=dde-file-manager,Exec=$out/bin/dde-file-manager," \ - dde-file-manager/dde-file-manager.desktop - - sed -i -e "s,Exec=gio,Exec=${glib.bin}/bin/gio," \ - dde-desktop/data/applications/dde-trash.desktop \ - dde-desktop/data/applications/dde-computer.desktop - - sed -i -e "s,/usr/lib/gvfs/gvfsd,${gvfs}/libexec/gvfsd," \ - dde-file-manager-lib/gvfs/networkmanager.cpp - - sed -i -e "s,/usr/sbin/smbd,${samba}/bin/smbd," \ - -e "s,/usr/sbin/groupadd,${shadow}/bin/groupadd," \ - -e "s,/usr/sbin/adduser,${shadow}/bin/adduser," \ - dde-file-manager-daemon/usershare/usersharemanager.cpp - - sed -i -e 's,startDetached("deepin-shortcut-viewer",startDetached("${deepin-shortcut-viewer}/bin/deepin-shortcut-viewer",' \ - dde-file-manager-lib/controllers/appcontroller.cpp - - sed -i -e 's,/bin/bash,${runtimeShell},' \ - -e 's,\,${procps}/bin/ps,' \ - -e 's,\,${gnugrep}/bin/grep,' \ - utils/utils.cpp \ - dde-file-manager-lib/controllers/fileeventprocessor.cpp - - # The hard coded path in `QString("/etc/xdg/%1/%2")` in - # dde-file-manager-lib/interfaces/dfmsettings.cpp - # does not needed a fix because all the standard locations - # are tried before faling back to /etc/xdg. - - # I do not know yet how to deal with: - # dde-file-manager-lib/sw_label/llsdeepinlabellibrary.h: return "/usr/lib/sw_64-linux-gnu/dde-file-manager/libllsdeeplabel.so"; - # dde-file-manager-lib/sw_label/filemanagerlibrary.h: return "/usr/lib/sw_64-linux-gnu/dde-file-manager/libfilemanager.so"; - # dde-file-manager-lib/sw_label/libinstall.sh:mkdir /usr/lib/sw_64-linux-gnu/dde-file-manager - # dde-file-manager-lib/sw_label/libinstall.sh:cp libfilemanager.so libllsdeeplabel.so /usr/lib/sw_64-linux-gnu/dde-file-manager - # They are not present on my installations of Deepin Linux, Arch Linux and Ubuntu. Can they be ignored? - - # Notes: - # - As file-roller is looked in the path using QStandardPaths::findExecutable, it is not been added as a dependency. - # - deepin-qt5config is a dependency exclusive to the Deepin Linux distribution. No other distribution has it, according to repology. - ''; - - qmakeFlags = [ - "QMAKE_CFLAGS_ISYSTEM=" - - # Disable ffmpeg - "CONFIG+=DISABLE_FFMPEG" - ]; - - preBuild = '' - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${zlib}/lib"; - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${libX11}/lib"; - ''; - - dontWrapQtApps = true; - - preFixup = '' - gappsWrapperArgs+=( - "''${qtWrapperArgs[@]}" - ) - ''; - - postFixup = '' - # debuging - unset LD_LIBRARY_PATH - searchForUnresolvedDLL $out - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "File manager and desktop module for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-file-manager"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-kwin/0001-dde-kwin.pc-make-paths-relative.patch b/pkgs/desktops/deepin/dde-kwin/0001-dde-kwin.pc-make-paths-relative.patch deleted file mode 100644 index 707eb207409..00000000000 --- a/pkgs/desktops/deepin/dde-kwin/0001-dde-kwin.pc-make-paths-relative.patch +++ /dev/null @@ -1,56 +0,0 @@ -From c4edb65554f90a5abfc2ecbf63587b8c6ef2653d Mon Sep 17 00:00:00 2001 -From: worldofpeace -Date: Tue, 22 Oct 2019 17:20:24 -0400 -Subject: [PATCH] dde-kwin.pc: make paths relative - -Values like libdir should be relative to the literal ${prefix}. -We also use @ONLY so we don't substitute values like ${prefix} -with CMake resulting in an unintentional replacement. ---- - plugins/kwin-xcb/lib/CMakeLists.txt | 2 +- - plugins/kwin-xcb/lib/dde-kwin.pc.in | 18 +++++++++--------- - 2 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/plugins/kwin-xcb/lib/CMakeLists.txt b/plugins/kwin-xcb/lib/CMakeLists.txt -index 0189b74..62e5553 100644 ---- a/plugins/kwin-xcb/lib/CMakeLists.txt -+++ b/plugins/kwin-xcb/lib/CMakeLists.txt -@@ -61,7 +61,7 @@ install_files( - kwinutils.h - ) - --configure_file(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc) -+configure_file(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) - if (CMAKE_INSTALL_LIBDIR) - install_files("/${CMAKE_INSTALL_LIBDIR}/pkgconfig" FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc) - elseif (CMAKE_LIBRARY_OUTPUT_DIRECTORY) -diff --git a/plugins/kwin-xcb/lib/dde-kwin.pc.in b/plugins/kwin-xcb/lib/dde-kwin.pc.in -index 9b1d813..1179761 100644 ---- a/plugins/kwin-xcb/lib/dde-kwin.pc.in -+++ b/plugins/kwin-xcb/lib/dde-kwin.pc.in -@@ -1,13 +1,13 @@ --prefix=${CMAKE_INSTALL_PREFIX} --exec_prefix=${CMAKE_INSTALL_PREFIX} --libdir=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} --includedir=${INCLUDE_OUTPUT_PATH} -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${prefix}/lib -+includedir=@INCLUDE_OUTPUT_PATH@ - - --Name: ${PROJECT_NAME} -+Name: @PROJECT_NAME@ - Description: DDE KWin plugin library --Version: ${PROJECT_VERSION} --Libs: -l${PROJECT_NAME} --Libs.private: -L/usr/X11R6/lib64 -lQt5X11Extras -lKF5WindowSystem -lQt5Widgets -lQt5Gui -lKF5ConfigCore -lKF5CoreAddons -lQt5Core -lGL -lpthread --Cflags: -I${INCLUDE_OUTPUT_PATH} -+Version: @PROJECT_VERSION@ -+Libs: -l$@PROJECT_NAME@ -+Libs.private: -L/usr/X11R6/lib64 -lQt5X11Extras -lKF5WindowSystem -lQt5Widgets -lQt5Gui -lKF5ConfigCore -lKF5CoreAddons -lQt5Core -lGL -lpthread -+Cflags: -I@INCLUDE_OUTPUT_PATH@ - --- -2.23.0 - diff --git a/pkgs/desktops/deepin/dde-kwin/default.nix b/pkgs/desktops/deepin/dde-kwin/default.nix deleted file mode 100644 index ce1a1a8dda0..00000000000 --- a/pkgs/desktops/deepin/dde-kwin/default.nix +++ /dev/null @@ -1,142 +0,0 @@ -{ stdenv -, mkDerivation -, pkgconfig -, fetchFromGitHub -, deepin -, cmake -, extra-cmake-modules -, qtbase -, libxcb -, kglobalaccel -, kwindowsystem -, kcoreaddons -, kwin -, dtkcore -, gsettings-qt -, fontconfig -, deepin-desktop-schemas -, glib -, libXrender -, mtdev -, qttools -, deepin-gettext-tools -, kwayland -, qtx11extras -, qtquickcontrols2 -, epoxy -, qt5integration -, dde-session-ui -, dbus -, wrapGAppsHook -}: - -mkDerivation rec { - pname = "dde-kwin"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0bvkx9h5ygj46a0j76kfyq3gvk6zn4fx6clhrmcr40hbi2k33cbl"; - }; - - nativeBuildInputs = [ - cmake - deepin-gettext-tools - deepin.setupHook - extra-cmake-modules - pkgconfig - wrapGAppsHook - ]; - - buildInputs = [ - deepin-desktop-schemas - dtkcore - epoxy - fontconfig - glib - gsettings-qt - kcoreaddons - kglobalaccel - kwayland - kwin - kwindowsystem - libXrender - libxcb - mtdev - qtbase - qtquickcontrols2 - qttools - qtx11extras - qt5integration - ]; - - # Need to add kwayland around: - # * https://github.com/linuxdeepin/dde-kwin/blob/5226bb984c844129f9fa589da56e77decb7b39a1/plugins/kwineffects/blur/CMakeLists.txt#L14 - NIX_CFLAGS_COMPILE = [ - "-I${kwayland.dev}/include/KF5" - ]; - - cmakeFlags = [ - "-DKWIN_VERSION=${(builtins.parseDrvName kwin.name).version}" - ]; - - patches = [ - ./0001-dde-kwin.pc-make-paths-relative.patch - ./fix-paths.patch - ]; - - postPatch = '' - searchHardCodedPaths - - patchShebangs translate_ts2desktop.sh \ - translate_generation.sh \ - translate_desktop2ts.sh \ - plugins/kwin-xcb/plugin/translate_generation.sh - - fixPath ${deepin-gettext-tools} /usr/bin/deepin-desktop-ts-convert translate_desktop2ts.sh translate_ts2desktop.sh - - fixPath $out /etc/xdg configures/CMakeLists.txt deepin-wm-dbus/deepinwmfaker.cpp - - # TODO: Need environmental patch - fixPath /run/current-system/sw /usr/lib plugins/kwin-xcb/plugin/main.cpp - - substituteInPlace configures/kwin-wm-multitaskingview.desktop \ - --replace "dbus-send" "${dbus}/bin/dbus-send" - - fixPath ${dde-session-ui} /usr/lib/deepin-daemon/dde-warning-dialog deepin-wm-dbus/deepinwmfaker.cpp - - # Correct qt plugin installation path to be within dde-kwin prefix. - substituteInPlace CMakeLists.txt \ - --subst-var-by plugin_path "$out/$qtPluginPrefix" - ''; - - postInstall = '' - # Correct invalid path in .pc - substituteInPlace $out/lib/pkgconfig/dde-kwin.pc \ - --replace "-L/usr/X11R6/lib64" "" - - chmod +x $out/bin/kwin_no_scale - ''; - - dontWrapQtApps = true; - - preFixup = '' - gappsWrapperArgs+=( - "''${qtWrapperArgs[@]}" - ) - ''; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "KWin configuration for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-kwin"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo worldofpeace ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-kwin/fix-paths.patch b/pkgs/desktops/deepin/dde-kwin/fix-paths.patch deleted file mode 100644 index 1bf576e5c1a..00000000000 --- a/pkgs/desktops/deepin/dde-kwin/fix-paths.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index feef49d..ecb7ed2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,9 +26,9 @@ macro(query_qmake args output) - endif() - endmacro() - --query_qmake("QT_INSTALL_PLUGINS" QT_INSTALL_PLUGINS) -+set(QT_INSTALL_PLUGINS @plugin_path@) - --set(PLUGIN_INSTALL_PATH ${QT_INSTALL_PLUGINS}/platforms) -+set(PLUGIN_INSTALL_PATH @plugin_path@/platforms) - # Find includes in corresponding build directories - set(CMAKE_INCLUDE_CURRENT_DIR ON) - # Instruct CMake to run moc automatically when needed diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix deleted file mode 100644 index 0a50f7177ba..00000000000 --- a/pkgs/desktops/deepin/dde-launcher/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, cmake -, dde-qt-dbus-factory -, dde-session-ui -, deepin -, deepin-desktop-schemas -, deepin-wallpapers -, dtkcore -, dtkwidget -, gsettings-qt -, qtsvg -, qttools -, qtx11extras -, which -, xdg_utils -, wrapGAppsHook -, glib -}: - -mkDerivation rec { - pname = "dde-launcher"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0zh6bb0r3pgjrnw9rba46ghdzza1ka1mv7r1znf8gw24wsjgjcpn"; - }; - - nativeBuildInputs = [ - cmake - pkgconfig - qttools - wrapGAppsHook - deepin.setupHook - ]; - - buildInputs = [ - dde-qt-dbus-factory - dde-session-ui - deepin-desktop-schemas - deepin-wallpapers - dtkcore - dtkwidget - glib - gsettings-qt - qtsvg - qtx11extras - which - xdg_utils - ]; - - postPatch = '' - # debugging - searchHardCodedPaths - - substituteInPlace CMakeLists.txt --replace "/usr/share" "$out/share" - - substituteInPlace src/dbusservices/com.deepin.dde.Launcher.service --replace "/usr" "$out" - - substituteInPlace src/historywidget.cpp --replace "xdg-open" "${xdg_utils}/bin/xdg-open" - substituteInPlace src/widgets/miniframebottombar.cpp --replace "dde-shutdown" "${dde-session-ui}/bin/dde-shutdown" - substituteInPlace src/widgets/miniframerightbar.cpp --replace "which" "${which}/bin/which" - - # Uncomment (and remove space after $) after packaging deepin-manual - #substituteInPlace src/sharedeventfilter.cpp --replace "dman" "$ {deepin-manual}/bin/dman" - - for f in src/boxframe/*.cpp; do - substituteInPlace $f --replace "/usr/share/backgrounds/default_background.jpg" "${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg" - done - - # note: `dbus-send` path does not need to be hard coded because it is not used for dtkcore >= 2.0.8.0 - ''; - - dontWrapQtApps = true; - - preFixup = '' - gappsWrapperArgs+=( - "''${qtWrapperArgs[@]}" - ) - ''; - - postFixup = '' - # debugging - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin Desktop Environment launcher module"; - homepage = "https://github.com/linuxdeepin/dde-launcher"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix deleted file mode 100644 index d54558acf08..00000000000 --- a/pkgs/desktops/deepin/dde-network-utils/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, substituteAll -, qmake -, pkgconfig -, qttools -, dde-qt-dbus-factory -, proxychains -, which -, deepin -}: - -mkDerivation rec { - pname = "dde-network-utils"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0670kfnkplf7skkd1ql6y9x15kmrcbdv1005qwkg4vn8hic6s0z3"; - }; - - nativeBuildInputs = [ - qmake - pkgconfig - qttools - deepin.setupHook - ]; - - buildInputs = [ - dde-qt-dbus-factory - proxychains - which - ]; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit which proxychains; - }) - ]; - - postPatch = '' - searchHardCodedPaths # for debugging - patchShebangs translate_generation.sh - ''; - - postFixup = '' - searchHardCodedPaths $out # for debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin network utils"; - homepage = "https://github.com/linuxdeepin/dde-network-utils"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-network-utils/fix-paths.patch b/pkgs/desktops/deepin/dde-network-utils/fix-paths.patch deleted file mode 100644 index 9f7ecd423c5..00000000000 --- a/pkgs/desktops/deepin/dde-network-utils/fix-paths.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur dde-network-utils-master.orig/dde-network-utils.pro dde-network-utils-master/dde-network-utils.pro ---- dde-network-utils-master.orig/dde-network-utils.pro 2019-04-04 03:37:46.000000000 -0300 -+++ dde-network-utils-master/dde-network-utils.pro 2019-04-07 05:56:28.283195087 -0300 -@@ -52,6 +52,7 @@ - - QMAKE_PKGCONFIG_NAME = libddenetworkutils - QMAKE_PKGCONFIG_DESCRIPTION = libddenetworkutils -+QMAKE_PKGCONFIG_PREFIX = $$PREFIX - QMAKE_PKGCONFIG_INCDIR = $$includes.path - QMAKE_PKGCONFIG_LIBDIR = $$target.path - QMAKE_PKGCONFIG_DESTDIR = pkgconfig -diff -ur dde-network-utils-master.orig/networkworker.cpp dde-network-utils-master/networkworker.cpp ---- dde-network-utils-master.orig/networkworker.cpp 2019-04-04 03:37:46.000000000 -0300 -+++ dde-network-utils-master/networkworker.cpp 2019-04-07 05:54:28.656479216 -0300 -@@ -80,7 +80,7 @@ - } - } - -- const bool isAppProxyVaild = QProcess::execute("which", QStringList() << "/usr/bin/proxychains4") == 0; -+ const bool isAppProxyVaild = QProcess::execute("@which@/bin/which", QStringList() << "@proxychains@/bin/proxychains4") == 0; - m_networkModel->onAppProxyExistChanged(isAppProxyVaild); - } - diff --git a/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch b/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch deleted file mode 100644 index a6941e975eb..00000000000 --- a/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 4f457d38e9e75bc97ee7dba633bf0cdd61b8cd5b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= -Date: Fri, 19 Apr 2019 22:01:16 -0300 -Subject: [PATCH] Use an environment variable to find plugins - ---- - pluginmanager.cpp | 18 ++++++++++++------ - 1 file changed, 12 insertions(+), 6 deletions(-) - -diff --git a/pluginmanager.cpp b/pluginmanager.cpp -index 0c03237..79bdf86 100644 ---- a/pluginmanager.cpp -+++ b/pluginmanager.cpp -@@ -34,13 +34,19 @@ QList PluginManager::reduceGetOptions(const QString &actionID) - void PluginManager::load() - { - -- QDir dir("/usr/lib/polkit-1-dde/plugins/"); -- QFileInfoList pluginFiles = dir.entryInfoList((QStringList("*.so"))); -+ QStringList pluginsDirs = QProcessEnvironment::systemEnvironment().value("DDE_POLKIT_PLUGINS_DIRS").split(QDir::listSeparator(), QString::SkipEmptyParts); -+ pluginsDirs.append("/usr/lib/polkit-1-dde/plugins/"); - -- for (const QFileInfo &pluginFile : pluginFiles) { -- AgentExtension *plugin = loadFile(pluginFile.absoluteFilePath()); -- if (plugin) -- m_plugins << plugin; -+ for (const QString &dirName : pluginsDirs) { -+ QDir dir(dirName); -+ -+ QFileInfoList pluginFiles = dir.entryInfoList((QStringList("*.so"))); -+ -+ for (const QFileInfo &pluginFile : pluginFiles) { -+ AgentExtension *plugin = loadFile(pluginFile.absoluteFilePath()); -+ if (plugin) -+ m_plugins << plugin; -+ } - } - } - --- -2.21.0 - diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix deleted file mode 100644 index 1ca9a80abaf..00000000000 --- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, qttools -, polkit-qt -, dtkcore -, dtkwidget -, dde-qt-dbus-factory -, deepin -}: - -mkDerivation rec { - pname = "dde-polkit-agent"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "00p8syx6rfwhq7wdsk37hm9mvwd0kwj9h0s39hii892h1psd84q9"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - qttools - deepin.setupHook - ]; - - buildInputs = [ - dde-qt-dbus-factory - dtkcore - dtkwidget - polkit-qt - ]; - - postPatch = '' - searchHardCodedPaths - patchShebangs translate_generation.sh - - fixPath $out /usr dde-polkit-agent.pro polkit-dde-authentication-agent-1.desktop - fixPath /run/current-system/sw /usr/lib/polkit-1-dde/plugins pluginmanager.cpp - ''; - - postFixup = '' - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "PolicyKit agent for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-polkit-agent"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix deleted file mode 100644 index c7efb0f4b04..00000000000 --- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv -, fetchFromGitHub -, qmake -, python3 -, deepin -}: - -stdenv.mkDerivation rec { - pname = "dde-qt-dbus-factory"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1wbh4jgvy3c09ivy0vvfk0azkg4d2sv37y23c9rq49jb3sakcjgm"; - }; - - nativeBuildInputs = [ - qmake - python3 - deepin.setupHook - ]; - - postPatch = '' - searchHardCodedPaths - fixPath $out /usr \ - libdframeworkdbus/DFrameworkdbusConfig.in \ - libdframeworkdbus/libdframeworkdbus.pro - ''; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Qt DBus interface library for Deepin software"; - homepage = "https://github.com/linuxdeepin/dde-qt-dbus-factory"; - license = with licenses; [ gpl3Plus lgpl2Plus ]; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix deleted file mode 100644 index ff785f16c81..00000000000 --- a/pkgs/desktops/deepin/dde-session-ui/default.nix +++ /dev/null @@ -1,157 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, dbus -, dde-daemon -, dde-qt-dbus-factory -, deepin -, deepin-desktop-schemas -, deepin-gettext-tools -, deepin-icon-theme -, deepin-wallpapers -, dtkcore -, dtkwidget -, gnugrep -, gsettings-qt -, lightdm_qt -, onboard -, qtsvg -, qttools -, qtx11extras -, setxkbmap -, utillinux -, which -, xkeyboard_config -, xorg -, xrandr -, wrapGAppsHook -}: - -mkDerivation rec { - pname = "dde-session-ui"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1gy9nlpkr9ayrs1z2dvd7h0dqlw6fq2m66d9cs48qyfkr6c8l9jj"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - qttools - deepin-gettext-tools - wrapGAppsHook - deepin.setupHook - ]; - - buildInputs = [ - dbus - dde-daemon - dde-qt-dbus-factory - deepin-desktop-schemas - deepin-icon-theme - deepin-wallpapers - dtkcore - dtkwidget - gnugrep - gsettings-qt - lightdm_qt - onboard - qtsvg - qtx11extras - setxkbmap - utillinux - which - xkeyboard_config - xorg.libXcursor - xorg.libXrandr - xorg.libXtst - xrandr - ]; - - postPatch = '' - searchHardCodedPaths # debugging - - patchShebangs translate_generation.sh translate_desktop.sh - - substituteInPlace translate_desktop.sh --replace "/usr/bin/deepin-desktop-ts-convert" "deepin-desktop-ts-convert" - - find -type f -exec sed -i -e "s,path = /etc,path = $out/etc," {} + - find -type f -exec sed -i -e "s,path = /usr,path = $out," {} + - find -type f -exec sed -i -e "s,/usr/share/dde-session-ui,$out/share/dde-session-ui," {} + - - substituteInPlace dde-osd/dde-osd_autostart.desktop --replace "Exec=/usr/lib/deepin-daemon/dde-osd" "Exec=$out/lib/deepin-daemon/dde-osd" - substituteInPlace dde-osd/com.deepin.dde.osd.service --replace "Exec=/usr/lib/deepin-daemon/dde-osd" "Exec=$out/lib/deepin-daemon/dde-osd" - substituteInPlace dde-lock/com.deepin.dde.lockFront.service --replace "Exec=/usr/bin/dde-lock" "Exec=$out/bin/dde-lock" - substituteInPlace dmemory-warning-dialog/com.deepin.dde.MemoryWarningDialog.service --replace "Exec=/usr/bin/dmemory-warning-dialog" "Exec=$out/bin/dmemory-warning-dialog" - substituteInPlace dde-warning-dialog/com.deepin.dde.WarningDialog.service --replace "Exec=/usr/lib/deepin-daemon/dde-warning-dialog" "Exec=$out/lib/deepin-daemon/dde-warning-dialog" - substituteInPlace dde-shutdown/com.deepin.dde.shutdownFront.service --replace "Exec=/usr/bin/dde-shutdown" "Exec=$out/bin/dde-shutdown" - substituteInPlace dde-welcome/com.deepin.dde.welcome.service --replace "Exec=/usr/lib/deepin-daemon/dde-welcome" "Exec=$out/lib/deepin-daemon/dde-welcome" - substituteInPlace session-ui-guardien/session-ui-guardien.desktop --replace "Exec=/usr/bin/session-ui-guardien" "Exec=$out/bin/session-ui-guardien" - substituteInPlace lightdm-deepin-greeter/lightdm-deepin-greeter.desktop --replace "Exec=/usr/bin/deepin-greeter" "Exec=$out/bin/deepin-greeter" - substituteInPlace misc/applications/deepin-toggle-desktop.desktop.in --replace "Exec=/usr/lib/deepin-daemon/desktop-toggle" "Exec=${dde-daemon}/lib/deepin-daemon/desktop-toggle" - - # Uncomment (and remove space after $) after packaging deepin-system-monitor - #substituteInPlace dde-shutdown/view/contentwidget.cpp --replace "/usr/bin/deepin-system-monitor" "$ {deepin-system-monitor}/bin/deepin-system-monitor" - - substituteInPlace dde-offline-upgrader/main.cpp --replace "dbus-send" "${dbus}/bin/dbus-send" - substituteInPlace dde-osd/kblayoutindicator.cpp --replace "dbus-send" "${dbus}/bin/dbus-send" - substituteInPlace dde-shutdown/view/contentwidget.cpp --replace "/usr/share/backgrounds/deepin" "${deepin-wallpapers}/share/backgrounds/deepin" - substituteInPlace dde-welcome/mainwidget.cpp --replace "dbus-send" "${dbus}/bin/dbus-send" - substituteInPlace dmemory-warning-dialog/src/buttondelegate.cpp --replace "dbus-send" "${dbus}/bin/dbus-send" - substituteInPlace dmemory-warning-dialog/src/buttondelegate.cpp --replace "kill" "${utillinux}/bin/dbus-send" - substituteInPlace global_util/xkbparser.h --replace "/usr/share/X11/xkb/rules/base.xml" "${xkeyboard_config}/share/X11/xkb/rules/base.xml" - substituteInPlace lightdm-deepin-greeter/deepin-greeter --replace "/etc/deepin/greeters.d" "$out/etc/deepin/greeters.d" - substituteInPlace lightdm-deepin-greeter/main.cpp --replace "/usr/share/icons/deepin" "${deepin-icon-theme}/share/icons/deepin" - substituteInPlace lightdm-deepin-greeter/scripts/00-xrandr --replace "egrep" "${gnugrep}/bin/egrep" - substituteInPlace lightdm-deepin-greeter/scripts/00-xrandr --replace "xrandr" "${xrandr}/bin/xrandr" - 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 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" - substituteInPlace widgets/virtualkbinstance.cpp --replace "onboard" "${onboard}/bin/onboard" - - # fix default background url - substituteInPlace widgets/fullscreenbackground.cpp --replace "/usr/share/backgrounds/default_background.jpg" "${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg" - - # NOTES - # - on deepin linux /usr/share/icons/default/index.theme is controlled by alternatives, without an equivalent mechanism in NixOS - # - do not wrap dde-dman-portal related files: it appears it has been removed: https://github.com/linuxdeepin/dde-session-ui/commit/3bd028cf135ad22c784c0146e447ef34a69af768 - ''; - - dontWrapQtApps = true; - - preFixup = '' - gappsWrapperArgs+=( - "''${qtWrapperArgs[@]}" - ) - ''; - - postFixup = '' - # wrapGAppsHook or wrapQtAppsHook does not work with binaries outside of $out/bin or $out/libexec - for binary in $out/lib/deepin-daemon/*; do - wrapProgram $binary "''${gappsWrapperArgs[@]}" - done - - searchHardCodedPaths $out # debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin desktop-environment - Session UI module"; - homepage = "https://github.com/linuxdeepin/dde-session-ui"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix deleted file mode 100644 index 5fa6c93951d..00000000000 --- a/pkgs/desktops/deepin/deepin-anything/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, fetchpatch -, pkgconfig -, qtbase -, udisks2-qt5 -, utillinux -, dtkcore -, deepin -}: - -mkDerivation rec { - pname = "deepin-anything"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1kvyffrii4b012f6ld1ih14qrn7gg5cxbdpbkac0wxb22hnz0azm"; - }; - - patches = [ - # fix compilation error and add support to kernel 5.6 - # https://github.com/linuxdeepin/deepin-anything/pull/27 - (fetchpatch { - name = "linux-5.6.patch"; - url = "https://github.com/linuxdeepin/deepin-anything/commit/764b820c2bcd7248993349b32f91043fc58ee958.patch"; - sha256 = "1ww4xllxc2s04px6fy8wp5cyw54xaz155ry30sqz21vl8awfr36h"; - }) - ]; - - outputs = [ "out" "modsrc" ]; - - nativeBuildInputs = [ - pkgconfig - deepin.setupHook - ]; - - buildInputs = [ - dtkcore - qtbase - udisks2-qt5 - utillinux - ]; - - enableParallelBuilding = true; - - makeFlags = [ - "DEB_HOST_MULTIARCH=" - "PREFIX=${placeholder "out"}" - ]; - - postPatch = '' - searchHardCodedPaths # for debugging - fixPath $modsrc /usr/src Makefile - fixPath $out /usr Makefile - fixPath $out /usr server/tool/tool.pro - fixPath $out /etc server/tool/tool.pro - fixPath $out /usr/bin \ - server/tool/deepin-anything-tool.service \ - server/tool/com.deepin.anything.service \ - server/monitor/deepin-anything-monitor.service - sed -e 's,/lib/systemd,$$PREFIX/lib/systemd,' -i server/monitor/src/src.pro server/tool/tool.pro - ''; - - postFixup = '' - searchHardCodedPaths $out # for debugging - searchHardCodedPaths $modsrc # for debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin file search tool"; - homepage = "https://github.com/linuxdeepin/deepin-anything"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/pkgs/desktops/deepin/deepin-calculator/default.nix deleted file mode 100644 index 67ead7d314a..00000000000 --- a/pkgs/desktops/deepin/deepin-calculator/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, qttools -, qtsvg -, dtkcore -, dtkwidget -, deepin -}: - -mkDerivation rec { - pname = "deepin-calculator"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0f26y7b3giybybhvlzbnwcw8kidzvhq66h0c15n9ww81gnlqf7v5"; - }; - - nativeBuildInputs = [ - qmake - pkgconfig - qttools - deepin.setupHook - ]; - - buildInputs = [ - dtkcore - dtkwidget - qtsvg - ]; - - postPatch = '' - searchHardCodedPaths # debugging - patchShebangs translate_generation.sh - fixPath $out /usr deepin-calculator.pro - substituteInPlace deepin-calculator.desktop --replace "Exec=deepin-calculator" "Exec=$out/bin/deepin-calculator" - ''; - - postFixup = '' - searchHardCodedPaths $out # debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Easy to use calculator for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/deepin-calculator"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix deleted file mode 100644 index 74fa53b715d..00000000000 --- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ stdenv -, fetchFromGitHub -, deepin-wallpapers -, deepin -}: - -stdenv.mkDerivation rec { - pname = "deepin-desktop-base"; - version = "2019.07.10"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0rs7bjy35k5gc5nbba1cijhdz16zny30lgmcf2ckx1pkdszk2vra"; - }; - - nativeBuildInputs = [ - deepin.setupHook - ]; - - buildInputs = [ - deepin-wallpapers - ]; - - # TODO: Fedora recommended dependencies: - # deepin-wallpapers - # plymouth-theme-deepin - - postPatch = '' - searchHardCodedPaths - - fixPath $out /etc Makefile - fixPath $out /usr Makefile - - # Remove Deepin distro's lsb-release - # Don't override systemd timeouts - # Remove apt-specific templates - echo ---------------------------------------------------------------- - echo grep --color=always -E 'lsb-release|systemd|python-apt|backgrounds' Makefile - grep --color=always -E 'lsb-release|systemd|python-apt|backgrounds' Makefile - echo ---------------------------------------------------------------- - sed -i -E '/lsb-release|systemd|python-apt|backgrounds/d' Makefile - ''; - - postInstall = '' - # Make a symlink for deepin-version - ln -s ../lib/deepin/desktop-version $out/etc/deepin-version - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Base assets and definitions for Deepin Desktop Environment"; - # TODO: revise - longDescription = '' - This package provides some components for Deepin desktop environment. - - deepin logo - - deepin desktop version - - login screen background image - - language information - ''; - homepage = "https://github.com/linuxdeepin/deepin-desktop-base"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix deleted file mode 100644 index 15f9498cf0d..00000000000 --- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv -, fetchFromGitHub -, python3 -, dconf -, glib -, deepin-gtk-theme -, deepin-icon-theme -, deepin-sound-theme -, deepin-wallpapers -, deepin -}: - -stdenv.mkDerivation rec { - pname = "deepin-desktop-schemas"; - version = "3.13.9"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1c69j6s7561zb1hrd1j3ihji1nvpgfzfgnp6svsv8jd8dg8vs8l1"; - }; - - nativeBuildInputs = [ - python3 - glib.dev - deepin.setupHook - ]; - - buildInputs = [ - dconf - deepin-gtk-theme - deepin-icon-theme - deepin-sound-theme - deepin-wallpapers - ]; - - postPatch = '' - searchHardCodedPaths - - # fix default background url - sed -i -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,' \ - overrides/common/com.deepin.wrap.gnome.desktop.override - - fixPath ${deepin-wallpapers} /usr/share/backgrounds \ - overrides/common/com.deepin.wrap.gnome.desktop.override - - fixPath ${deepin-wallpapers} /usr/share/wallpapers/deepin \ - schemas/com.deepin.dde.appearance.gschema.xml - - # still hardcoded paths: - # /etc/gnome-settings-daemon/xrandr/monitors.xml ? gnome3.gnome-settings-daemon - # /usr/share/backgrounds/gnome/adwaita-lock.jpg ? gnome3.gnome-backgrounds - # /usr/share/backgrounds/gnome/adwaita-timed.xml gnome3.gnome-backgrounds - # /usr/share/desktop-directories - ''; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - doCheck = true; - checkTarget = "test"; - - postInstall = '' - glib-compile-schemas --strict $out/share/glib-2.0/schemas - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "GSettings deepin desktop-wide schemas"; - homepage = "https://github.com/linuxdeepin/deepin-desktop-schemas"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-editor/default.nix b/pkgs/desktops/deepin/deepin-editor/default.nix deleted file mode 100644 index 0124ca8cc9e..00000000000 --- a/pkgs/desktops/deepin/deepin-editor/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, cmake -, deepin -, dtkcore -, dtkwidget -, kcodecs -, qttools -, syntax-highlighting -, wrapQtAppsHook -}: - -stdenv.mkDerivation rec { - pname = "deepin-editor"; - version = "1.2.9.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0g7c3adqwn8i4ndxdrzibahr75dddz1fiqnsh3bjj1jjr86rv4ks"; - }; - - nativeBuildInputs = [ - cmake - pkgconfig - qttools - wrapQtAppsHook - deepin.setupHook - ]; - - buildInputs = [ - dtkcore - dtkwidget - kcodecs - syntax-highlighting - ]; - - postPatch = '' - searchHardCodedPaths # debugging - - patchShebangs translate_generation.sh - - fixPath $out /usr \ - CMakeLists.txt \ - dedit/main.cpp \ - src/resources/settings.json \ - src/thememodule/themelistmodel.cpp - - substituteInPlace deepin-editor.desktop \ - --replace "Exec=deepin-editor" "Exec=$out/bin/deepin-editor" - - substituteInPlace src/editwrapper.cpp \ - --replace "appExec = \"deepin-editor\"" "appExec = \"$out/bin/deepin-editor\"" - ''; - - postFixup = '' - searchHardCodedPaths $out # debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Simple editor for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/deepin-editor"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo worldofpeace ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix deleted file mode 100644 index 432add458de..00000000000 --- a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv -, fetchFromGitHub -, gettext -, python3Packages -, perlPackages -, deepin -}: - -stdenv.mkDerivation rec { - pname = "deepin-gettext-tools"; - version = "1.0.8"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "03cwa82dd14a31v44jd3z0kpiri6g21ar4f48s8ph78nvjy55880"; - }; - - nativeBuildInputs = [ - python3Packages.wrapPython - ]; - - buildInputs = [ - gettext - perlPackages.perl - perlPackages.XMLLibXML - perlPackages.ConfigTiny - python3Packages.python - ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - postPatch = '' - sed -e 's/sudo cp/cp/' -i src/generate_mo.py - ''; - - postFixup = '' - wrapPythonPrograms - wrapPythonProgramsIn "$out/lib/${pname}" - wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin Internationalization utilities"; - homepage = "https://github.com/linuxdeepin/deepin-gettext-tools"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix deleted file mode 100644 index eee07470585..00000000000 --- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv -, fetchFromGitHub -, gtk-engine-murrine -, deepin -}: - -stdenv.mkDerivation rec { - pname = "deepin-gtk-theme"; - version = "17.10.11"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "deepin-gtk-theme"; - rev = version; - sha256 = "0zs6mq70yd1k3d9zm3q6zxnw1md56r4imad5imdxwx58yxdx47fw"; - }; - - propagatedUserEnvPkgs = [ - gtk-engine-murrine - ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin GTK Theme"; - homepage = "https://github.com/linuxdeepin/deepin-gtk-theme"; - license = licenses.lgpl3; - platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix deleted file mode 100644 index b56b219faff..00000000000 --- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ stdenv -, fetchFromGitHub -, gtk3 -, xcursorgen -, papirus-icon-theme -, hicolor-icon-theme -, deepin -}: - -stdenv.mkDerivation rec { - pname = "deepin-icon-theme"; - version = "2020.05.21"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0b1s6kf0q804zbbghly981wzacy1spi8168shf3x8w95rqj6463p"; - }; - - nativeBuildInputs = [ - gtk3 - xcursorgen - ]; - - propagatedBuildInputs = [ - papirus-icon-theme - hicolor-icon-theme - ]; - - dontDropIconThemeCache = true; - - buildTargets = "all hicolor-links"; - - postPatch = '' - # fix: hicolor links should follow the deepin -> bloom naming change - # https://github.com/linuxdeepin/deepin-icon-theme/pull/24 - substituteInPlace tools/hicolor.links --replace deepin bloom - - substituteInPlace Sea/index.theme --replace Inherits=deepin Inherits=bloom - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/icons - cp -vai bloom* Sea $out/share/icons - - for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme - done - - cp -vai usr/share/icons/hicolor $out/share/icons - - runHook postInstall - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Icons for the Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/deepin-icon-theme"; - license = licenses.gpl3; - platforms = platforms.unix; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix deleted file mode 100644 index 43c18c85abc..00000000000 --- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, qttools -, qtsvg -, qtx11extras -, dtkcore -, dtkwidget -, qt5integration -, freeimage -, libraw -, libexif -, deepin -}: - -mkDerivation rec { - pname = "deepin-image-viewer"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "01524hfdy3wvdf07n9b3qb8jdpxzg2hwjpl4gxvr68qws5nbnb3c"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - qttools - deepin.setupHook - ]; - - buildInputs = [ - qtsvg - qtx11extras - dtkcore - dtkwidget - qt5integration - freeimage - libraw - libexif - ]; - - postPatch = '' - searchHardCodedPaths - patchShebangs viewer/generate_translations.sh - fixPath $out /usr viewer/com.deepin.ImageViewer.service - sed -i qimage-plugins/freeimage/freeimage.pro \ - qimage-plugins/libraw/libraw.pro \ - -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Image Viewer for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/deepin-image-viewer"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - badPlatforms = [ "aarch64-linux" ]; # See https://github.com/NixOS/nixpkgs/pull/46463#issuecomment-420274189 - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix deleted file mode 100644 index 983fe4e1c4d..00000000000 --- a/pkgs/desktops/deepin/deepin-menu/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, dtkcore -, dtkwidget -, qt5integration -, deepin -}: - -mkDerivation rec { - pname = "deepin-menu"; - version = "3.4.8"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "09i0ybllymlj7s46pxma5py6x8nknfja4gxn5gj9kpf2c37qsqjc"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - deepin.setupHook - ]; - - buildInputs = [ - dtkcore - dtkwidget - qt5integration - ]; - - postPatch = '' - searchHardCodedPaths - fixPath $out /usr \ - data/com.deepin.menu.service \ - deepin-menu.desktop \ - deepin-menu.pro - ''; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin menu service"; - homepage = "https://github.com/linuxdeepin/deepin-menu"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix deleted file mode 100644 index 68daffb0d15..00000000000 --- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, fetchpatch -, cmake -, pkgconfig -, qttools -, qtx11extras -, dtkcore -, dtkwidget -, ffmpeg_3 -, ffmpegthumbnailer -, mpv -, pulseaudio -, libdvdnav -, libdvdread -, xorg -, deepin -}: - -mkDerivation rec { - pname = "deepin-movie-reborn"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0cly8q0514a58s3h3wsvx9yxar7flz6i2q8xkrkfjias22b3z7b0"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - cmake - pkgconfig - qttools - deepin.setupHook - ]; - - buildInputs = [ - dtkcore - dtkwidget - ffmpeg_3 - ffmpegthumbnailer - libdvdnav - libdvdread - mpv - pulseaudio - qtx11extras - xorg.libXdmcp - xorg.libXtst - xorg.libpthreadstubs - 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 = '' - 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 pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin movie player"; - homepage = "https://github.com/linuxdeepin/deepin-movie-reborn"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix deleted file mode 100644 index 76d8847b73f..00000000000 --- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, dtkcore -, dtkwidget -, qt5integration -, deepin -}: - -mkDerivation rec { - pname = "deepin-shortcut-viewer"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "13vz8kjdqkrhgpvdgrvwn62vwzbyqp88hjm5m4rcqg3bh56709ma"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - ]; - - buildInputs = [ - dtkcore - dtkwidget - qt5integration - ]; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Pop-up shortcut viewer for Deepin applications"; - homepage = "https://github.com/linuxdeepin/deepin-shortcut-viewer"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix deleted file mode 100644 index e71c0cb77c5..00000000000 --- a/pkgs/desktops/deepin/deepin-sound-theme/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv -, fetchFromGitHub -, deepin -}: - -stdenv.mkDerivation rec { - pname = "deepin-sound-theme"; - version = "15.10.3"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "deepin-sound-theme"; - rev = version; - sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9"; - }; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin sound theme"; - homepage = "https://github.com/linuxdeepin/deepin-sound-theme"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix deleted file mode 100644 index ae312137942..00000000000 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ /dev/null @@ -1,117 +0,0 @@ -{ stdenv -, fetchFromGitHub -, pkgconfig -, cmake -, ninja -, vala_0_40 -, fetchpatch -, 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 -, libsepol -, utillinux -, deepin-menu -, deepin-shortcut-viewer -, deepin -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "deepin-terminal"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "deepin-terminal"; - rev = version; - sha256 = "1929saj828b438d07caw3cjhqq60v6gni7mi3fqrg9wdjz81xwv7"; - }; - - patches = [ - # Fix build with VTE 0.60 - (fetchpatch { - url = "https://github.com/linuxdeepin/deepin-terminal/commit/542d1035b609698ee81aa7971d20ca8e5930743d.patch"; - sha256 = "1pihiy70yc25fm5fx7i7v9gmi65v4mhldvi7xwv8rgr2z6hbfj41"; - }) - ]; - - nativeBuildInputs = [ - pkgconfig - cmake - ninja - 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 - wrapGAppsHook - ]; - - buildInputs = [ - at-spi2-core - dbus - deepin-menu - deepin-shortcut-viewer - epoxy - expect - gtk3 - json-glib - libXdmcp - libgee - libpthreadstubs - librsvg - libsecret - libtasn1 - libxcb - libxkbcommon - p11-kit - pcre - vte - wnck - gnutls - pcre2 - ]; - - postPatch = '' - searchHardCodedPaths - ''; - - cmakeFlags = [ - "-DTEST_BUILD=OFF" - "-DUSE_VENDOR_LIB=OFF" - "-DVERSION=${version}" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Default terminal emulator for Deepin"; - longDescription = '' - Deepin terminal, it sharpens your focus in the world of command line! - It is an advanced terminal emulator with workspace, multiple - windows, remote management, quake mode and other features. - ''; - homepage = "https://github.com/linuxdeepin/deepin-terminal"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/pkgs/desktops/deepin/deepin-turbo/default.nix deleted file mode 100644 index 6bba51ac674..00000000000 --- a/pkgs/desktops/deepin/deepin-turbo/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, cmake -, pkgconfig -, qtbase -, deepin -}: - -mkDerivation rec { - pname = "deepin-turbo"; - version = "0.0.3"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "15l0pgszmbirlaxj04ishj43kyvigsl1yaf58kxlbdb3lkmcp5f3"; - }; - - nativeBuildInputs = [ - cmake - pkgconfig - deepin.setupHook - ]; - - buildInputs = [ - qtbase - ]; - - postPatch = '' - searchHardCodedPaths # for debugging - fixPath $out /usr/lib/systemd src/booster-dtkwidget/CMakeLists.txt - fixPath $out /usr/lib/deepin-turbo src/booster-dtkwidget/deepin-turbo-booster-dtkwidget.service - ''; - - postFixup = '' - searchHardCodedPaths $out # for debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "A daemon that helps to launch applications faster"; - homepage = "https://github.com/linuxdeepin/deepin-turbo"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/deepin-wallpapers/default.nix deleted file mode 100644 index 4fa3d6043d5..00000000000 --- a/pkgs/desktops/deepin/deepin-wallpapers/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv -, fetchFromGitHub -, dde-api -, deepin -}: - -stdenv.mkDerivation rec { - pname = "deepin-wallpapers"; - version = "1.7.7"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "deepin-wallpapers"; - rev = version; - sha256 = "09cfnxbpms98ibqbi4xd51181q3az5n8rmndcdr9w12kyzniz7xv"; - }; - - nativeBuildInputs = [ - dde-api - deepin.setupHook - ]; - - postPatch = '' - searchHardCodedPaths # debugging - - sed -i -e "s:/usr/lib/deepin-api:${dde-api}/lib/deepin-api:" Makefile - sed -i -e "s:/usr/share/wallpapers:$out/share/wallpapers:" Makefile - ''; - - installPhase = '' - mkdir -p $out/share/wallpapers/deepin - cp -a deepin/* deepin-community/* deepin-private/* $out/share/wallpapers/deepin - mkdir -p $out/var/cache - cp -a image-blur $out/var/cache - - # Suggested by upstream - mkdir -p $out/share/backgrounds/deepin - ln -s ../../wallpapers/deepin/Hummingbird_by_Shu_Le.jpg $out/share/backgrounds/deepin/desktop.jpg - ln -s $(echo -n $out/share/wallpapers/deepin/Hummingbird_by_Shu_Le.jpg | md5sum | cut -d " " -f 1).jpg \ - $out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Wallpapers for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/deepin-wallpapers"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix deleted file mode 100644 index b177b2ccf35..00000000000 --- a/pkgs/desktops/deepin/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ pkgs, makeScope, libsForQt5 }: -let - packages = self: with self; { - setupHook = ./setup-hook.sh; - - # Update script tailored to deepin packages from git repository - updateScript = { pname, version, src }: - pkgs.genericUpdater { - inherit pname version; - attrPath = "deepin.${pname}"; - versionLister = "${pkgs.common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; - ignoredVersions = "^2014(\\.|rc)|^v[0-9]+"; - }; - - dde-api = callPackage ./dde-api { }; - dde-calendar = callPackage ./dde-calendar { }; - dde-control-center = callPackage ./dde-control-center { }; - dde-daemon = callPackage ./dde-daemon { }; - dde-dock = callPackage ./dde-dock { }; - dde-file-manager = callPackage ./dde-file-manager { }; - dde-kwin = callPackage ./dde-kwin { }; - dde-launcher = callPackage ./dde-launcher { }; - dde-network-utils = callPackage ./dde-network-utils { }; - dde-polkit-agent = callPackage ./dde-polkit-agent { }; - dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; - dde-session-ui = callPackage ./dde-session-ui { }; - deepin-anything = callPackage ./deepin-anything { }; - deepin-calculator = callPackage ./deepin-calculator { }; - deepin-desktop-base = callPackage ./deepin-desktop-base { }; - deepin-desktop-schemas = callPackage ./deepin-desktop-schemas { }; - deepin-editor = callPackage ./deepin-editor { }; - deepin-gettext-tools = callPackage ./deepin-gettext-tools { }; - deepin-gtk-theme = callPackage ./deepin-gtk-theme { }; - deepin-icon-theme = callPackage ./deepin-icon-theme { }; - deepin-image-viewer = callPackage ./deepin-image-viewer { }; - deepin-menu = callPackage ./deepin-menu { }; - deepin-movie-reborn = callPackage ./deepin-movie-reborn { }; - deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { }; - deepin-sound-theme = callPackage ./deepin-sound-theme { }; - deepin-terminal = callPackage ./deepin-terminal { - wnck = pkgs.libwnck3; - }; - 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 { }; - dtkwm = callPackage ./dtkwm { }; - go-dbus-factory = callPackage ./go-dbus-factory { }; - go-gir-generator = callPackage ./go-gir-generator { }; - go-lib = callPackage ./go-lib { }; - qcef = callPackage ./qcef { }; - qt5integration = callPackage ./qt5integration { }; - qt5platform-plugins = callPackage ./qt5platform-plugins { }; - startdde = callPackage ./startdde { }; - udisks2-qt5 = callPackage ./udisks2-qt5 { }; - - }; - -in -makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/deepin/disomaster/default.nix b/pkgs/desktops/deepin/disomaster/default.nix deleted file mode 100644 index 89cbe34ceaa..00000000000 --- a/pkgs/desktops/deepin/disomaster/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, qtbase -, libisoburn -, deepin -}: - -mkDerivation rec { - pname = "disomaster"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1kmhlnw37pdmlf7k9zry657xlhz40m9nzg361kiyisn186pfqpws"; - }; - - nativeBuildInputs = [ - deepin.setupHook - pkgconfig - qmake - ]; - - buildInputs = [ - libisoburn - qtbase - ]; - - postPatch = '' - searchHardCodedPaths # debugging - ''; - - qmakeFlags = [ - "QMAKE_PKGCONFIG_PREFIX=${placeholder "out"}" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - 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 deleted file mode 100644 index 2caef7ce916..00000000000 --- a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv -, fetchFromGitHub -, pkgconfig -, qmake -, qttools -, gnome3 -, dde-polkit-agent -, deepin -}: - -stdenv.mkDerivation rec { - pname = "dpa-ext-gnomekeyring"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "168j42nwyw7vcgwc0fha2pjpwwlgir70fq1hns4ia1dkdqa1nhzw"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - qttools - deepin.setupHook - ]; - - buildInputs = [ - dde-polkit-agent - gnome3.libgnome-keyring - ]; - - postPatch = '' - searchHardCodedPaths - patchShebangs translate_generation.sh - fixPath $out /usr dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "GNOME keyring extension for dde-polkit-agent"; - homepage = "https://github.com/linuxdeepin/dpa-ext-gnomekeyring"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix deleted file mode 100644 index 570b0cc2c11..00000000000 --- a/pkgs/desktops/deepin/dtkcore/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, gsettings-qt -, pythonPackages -, deepin -}: - -mkDerivation rec { - pname = "dtkcore"; - version = "2.1.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0xdh6mmrv8yr6mjmlwj0fv037parkkwfwlaibcbrskwxqp9iri1y"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - pythonPackages.wrapPython - deepin.setupHook - ]; - - buildInputs = [ - gsettings-qt - ]; - - postPatch = '' - searchHardCodedPaths # debugging - - # Fix shebang - sed -i tools/script/dtk-translate.py -e "s,#!env,#!/usr/bin/env," - ''; - - qmakeFlags = [ - "DTK_VERSION=${version}" - "LIB_INSTALL_DIR=${placeholder "out"}/lib" - "MKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs" - ]; - - postFixup = '' - chmod +x $out/lib/libdtk-${version}/DCore/bin/*.py - wrapPythonProgramsIn "$out/lib/libdtk-${version}/DCore/bin" "$out $pythonPath" - searchHardCodedPaths $out # debugging - ''; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin tool kit core library"; - homepage = "https://github.com/linuxdeepin/dtkcore"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix deleted file mode 100644 index 9be222830db..00000000000 --- a/pkgs/desktops/deepin/dtkwidget/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, qttools -, qtmultimedia -, qtsvg -, qtx11extras -, librsvg -, libstartup_notification -, gsettings-qt -, dde-qt-dbus-factory -, dtkcore -, deepin -}: - -mkDerivation rec { - pname = "dtkwidget"; - version = "2.1.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0yqrm1p0k1843ldvcd79dxl26ybyl5kljl6vwhzc58sx7pw4qmvh"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - qttools - ]; - - buildInputs = [ - qtmultimedia - qtsvg - qtx11extras - librsvg - libstartup_notification - gsettings-qt - dde-qt-dbus-factory - dtkcore - ]; - - outRef = placeholder "out"; - - qmakeFlags = [ - "INCLUDE_INSTALL_DIR=${outRef}/include" - "LIB_INSTALL_DIR=${outRef}/lib" - "QT_HOST_DATA=${outRef}" - ]; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin graphical user interface library"; - homepage = "https://github.com/linuxdeepin/dtkwidget"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix deleted file mode 100644 index 56031f11492..00000000000 --- a/pkgs/desktops/deepin/dtkwm/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, fetchpatch -, pkgconfig -, qmake -, qtx11extras -, dtkcore -, deepin -}: - -mkDerivation rec { - pname = "dtkwm"; - version = "2.0.12"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0rdzzqsggqarldwb4yp5s4sf5czicgxbdmibjn0pw32129r2d1g3"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - ]; - - buildInputs = [ - dtkcore - qtx11extras - ]; - - patches = [ - # Set DTK_MODULE_NAME - (fetchpatch { - url = "https://github.com/linuxdeepin/dtkwm/commit/2490891a.patch"; - sha256 = "0krydxjpnaihkgs1n49b6mcf3rd3lkispcnkb1j5vpfs9hp9f48j"; - }) - ]; - - outRef = placeholder "out"; - - qmakeFlags = [ - "QT_HOST_DATA=${outRef}" - "INCLUDE_INSTALL_DIR=${outRef}/include" - "LIB_INSTALL_DIR=${outRef}/lib" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin graphical user interface library"; - homepage = "https://github.com/linuxdeepin/dtkwm"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix deleted file mode 100644 index 1c1afd9d099..00000000000 --- a/pkgs/desktops/deepin/go-dbus-factory/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv -, fetchFromGitHub -, deepin -}: - -stdenv.mkDerivation rec { - pname = "go-dbus-factory"; - version = "0.9.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "06fqyad9f50gcjsjkh7929yyaprahdjhnd0dr4gl2797a7wysl3f"; - }; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - postPatch = '' - sed -i -e 's:/share/gocode:/share/go:' Makefile - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "GoLang DBus factory for the Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/go-dbus-factory"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix deleted file mode 100644 index 7768f9afc85..00000000000 --- a/pkgs/desktops/deepin/go-gir-generator/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv -, fetchpatch -, fetchFromGitHub -, pkgconfig -, go -, gobject-introspection -, libgudev -, deepin -}: - -stdenv.mkDerivation rec { - pname = "go-gir-generator"; - version = "2.0.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1ydzll8zlk897iqcihvv6p046p0rzr4qqz2drmz2nx95njp8n03a"; - }; - - patches = [ - # Fix compatibility with glib 2.63+ - # https://github.com/linuxdeepin/go-gir-generator/pull/11 - (fetchpatch { - url = "https://github.com/linuxdeepin/go-gir-generator/commit/7dea15a1a491f28d2ac8c411068ccefeba01aae3.patch"; - sha256 = "182d30qkj1rx9ynpj9zfxh53nykvfq9wxk4502zc42gfvadgzfgd"; - }) - ]; - - nativeBuildInputs = [ - pkgconfig - go - ]; - - buildInputs = [ - gobject-introspection - libgudev - ]; - - postPatch = '' - sed -i -e 's:/share/gocode:/share/go:' Makefile - ''; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - "GOCACHE=$(TMPDIR)/go-cache" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Generate static golang bindings for GObject"; - homepage = "https://github.com/linuxdeepin/go-gir-generator"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix deleted file mode 100644 index 7129d912e30..00000000000 --- a/pkgs/desktops/deepin/go-lib/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv -, fetchFromGitHub -, glib -, xorg -, gdk-pixbuf -, pulseaudio -, mobile-broadband-provider-info -, deepin -}: - -stdenv.mkDerivation rec { - pname = "go-lib"; - version = "5.4.5"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "021sq7nzvfwsa5ccsb3vdjk53m7cf693xm4wkdkrkf8pja6vz94q"; - }; - - buildInputs = [ - glib - xorg.libX11 - gdk-pixbuf - pulseaudio - mobile-broadband-provider-info - ]; - - installPhase = '' - mkdir -p $out/share/go/src/pkg.deepin.io/lib - cp -a * $out/share/go/src/pkg.deepin.io/lib - - rm -r $out/share/go/src/pkg.deepin.io/lib/debian - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Go bindings for Deepin Desktop Environment development"; - homepage = "https://github.com/linuxdeepin/go-lib"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix deleted file mode 100644 index c37915377d8..00000000000 --- a/pkgs/desktops/deepin/qcef/default.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, cmake -, qtbase -, qttools -, qtwebchannel -, qtx11extras -, gnome2 -, nss -, nspr -, alsaLib -, atk -, cairo -, cups -, dbus -, expat -, fontconfig -, gdk-pixbuf -, glib -, gtk2 -, libxcb -, pango -, pulseaudio -, xorg -, deepin -}: - -let - rpahtLibraries = [ - stdenv.cc.cc.lib # libstdc++.so.6 - alsaLib - atk - cairo - cups - dbus - expat - fontconfig - gdk-pixbuf - glib - gnome2.GConf - gtk2 - libxcb - nspr - nss - pango - pulseaudio - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - ]; - - libPath = stdenv.lib.makeLibraryPath rpahtLibraries; - -in -mkDerivation rec { - pname = "qcef"; - version = "1.1.8"; - - srcs = [ - (fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "14a33af1h3wj3yph080c1ri3m27bqj1v1k0jdqc63x7c3smnpwfk"; - name = pname; - }) - (fetchFromGitHub { - owner = "linuxdeepin"; - repo = "cef-binary"; - rev = "fecf00339545d2819224333cc506d5aa22ae8008"; - sha256 = "06i1zc7ciy7d0qhndiwpjrsii0x5i5hg9j6ddi4w5yf1nzgsrj4n"; - name = "cef-binary"; - }) - ]; - - sourceRoot = pname; - - nativeBuildInputs = [ - pkgconfig - cmake - qttools - deepin.setupHook - ]; - - buildInputs = [ - qtbase - qtwebchannel - qtx11extras - ] ++ rpahtLibraries; - - postUnpack = '' - rmdir ${pname}/cef - ln -s ../cef-binary ${pname}/cef - ''; - - postPatch = '' - searchHardCodedPaths - fixPath $out /usr src/core/qcef_global_settings.{h,cpp} - sed '/COMMAND rm -rf Release Resources/a COMMAND ldd qcef/libcef.so' -i src/CMakeLists.txt - sed '/COMMAND rm -rf Release Resources/a COMMAND patchelf --set-rpath ${libPath} qcef/libcef.so' -i src/CMakeLists.txt - ''; - - postFixup = '' - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version; src = (builtins.head srcs); }; - - meta = with stdenv.lib; { - description = "Qt5 binding of Chromium Embedded Framework"; - homepage = "https://github.com/linuxdeepin/qcef"; - license = licenses.lgpl3; - platforms = platforms.linux; - badPlatforms = [ "aarch64-linux" ]; # the cef-binary is not available - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix deleted file mode 100644 index e3bbaba068b..00000000000 --- a/pkgs/desktops/deepin/qt5integration/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, mtdev -, lxqt -, qtx11extras -, qtmultimedia -, qtsvg -, qt5platform-plugins -, qtstyleplugins -, dtkcore -, dtkwidget -, deepin -}: - -mkDerivation rec { - pname = "qt5integration"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "140wb3vcm2ji8jhqdxv8f4shiknia1zk8fssqlp09kzc1cmb4ncy"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - ]; - - buildInputs = [ - dtkcore - dtkwidget - qt5platform-plugins - mtdev - lxqt.libqtxdg - qtstyleplugins - qtx11extras - qtmultimedia - qtsvg - ]; - - postPatch = '' - sed -i dstyleplugin/dstyleplugin.pro \ - platformthemeplugin/qt5deepintheme-plugin.pro \ - iconengineplugins/svgiconengine/svgiconengine.pro \ - imageformatplugins/svg/svg.pro \ - -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," - ''; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Qt platform theme integration plugins for DDE"; - homepage = "https://github.com/linuxdeepin/qt5integration"; - license = with licenses; [ gpl3 lgpl2Plus bsd2 ]; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/qt5platform-plugins/default.nix deleted file mode 100644 index 33e4863c0d9..00000000000 --- a/pkgs/desktops/deepin/qt5platform-plugins/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, qtx11extras -, libSM -, mtdev -, cairo -, deepin -, qtbase -}: - -mkDerivation rec { - pname = "qt5platform-plugins"; - version = "5.0.11"; - - srcs = [ - (fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "14xkr3p49716jc9v7ksj6jgcmfa65qicqrmablizfi71srg3z2pr"; - }) - qtbase.src - ]; - - sourceRoot = "source"; - - nativeBuildInputs = [ - pkgconfig - qmake - ]; - - buildInputs = [ - qtx11extras - libSM - mtdev - cairo - qtbase - ]; - - postPatch = '' - # The Qt5 platforms plugin is vendored in the package, however what's there is not always up-to-date with what's in nixpkgs. - # We simply copy the headers from qtbase's source tarball. - mkdir -p platformplugin/libqt5xcbqpa-dev/${qtbase.version} - cp -r ../qtbase-everywhere-src-${qtbase.version}/src/plugins/platforms/xcb/*.h platformplugin/libqt5xcbqpa-dev/${qtbase.version}/ - ''; - - qmakeFlags = [ - "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version; src = (builtins.head srcs); }; - - meta = with stdenv.lib; { - description = "Qt platform theme integration plugin for DDE"; - homepage = "https://github.com/linuxdeepin/qt5platform-plugins"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/setup-hook.sh b/pkgs/desktops/deepin/setup-hook.sh deleted file mode 100755 index ce1d7330a22..00000000000 --- a/pkgs/desktops/deepin/setup-hook.sh +++ /dev/null @@ -1,64 +0,0 @@ -# Helper functions for deepin packaging - -searchHardCodedPaths() { - # Usage: - # - # searchHardCodedPaths [-a] [] - # - # Looks for ocurrences of FHS hard coded paths and command - # invocations in the given path (default: current directory) for - # the purpose of debugging a derivation. The option -a enables - # processing binary files as if they were text. - - local binary - if [ "$1" = "-a" ]; then - binary="-a" - shift - fi - - local path=$1 - - echo ----------- looking for command invocations in $path - grep --color=always -r -E '\<(ExecStart|Exec|startDetached|execute|exec\.(Command|LookPath))\>' $path || true - - echo ----------- looking for hard coded paths in $path - grep --color=always $binary -r -E '/(usr|bin|sbin|etc|var|opt)\>' $path || true - - echo ----------- done -} - -fixPath() { - # Usage: - # - # fixPath - # - # replaces occurences of by in - # removing /usr from the start of if present - - local parentdir=$1 - local path=$2 - local newpath=$parentdir$(echo $path | sed "s,^/usr,,") - local files=("${@:3}") - echo ======= grep --color=always "${path}" "${files[@]}" - grep --color=always "${path}" "${files[@]}" - echo +++++++ sed -i -e "s,$path,$newpath,g" "${files[@]}" - sed -i -e "s,$path,$newpath,g" "${files[@]}" -} - -searchForUnresolvedDLL() { - # Usage: - # - # searchForUnresolvedDLL - # - # looks in for executables with unresolved dynamic library paths - - local dir="$1" - echo ======= Looking for executables with unresolved dynamic library dependencies - echo $dir - for f in $(find -L "$dir" -type f -executable); do - if (ldd $f | grep -q "not found"); then - echo $f - ldd $f | grep --color=always "not found" - fi - done -} diff --git a/pkgs/desktops/deepin/startdde/default.nix b/pkgs/desktops/deepin/startdde/default.nix deleted file mode 100644 index 75b36e85de3..00000000000 --- a/pkgs/desktops/deepin/startdde/default.nix +++ /dev/null @@ -1,161 +0,0 @@ -{ stdenv -, buildGoPackage -, fetchFromGitHub -, pkgconfig -, alsaLib -, coreutils -, dde-api -, dde-daemon -, dde-dock -, dde-file-manager -, dde-polkit-agent -, dde-session-ui -, deepin -, deepin-desktop-base -, deepin-desktop-schemas -, deepin-turbo -, dde-kwin -, glib -, gnome3 -, go -, go-dbus-factory -, go-gir-generator -, go-lib -, gtk3 -, jq -, kmod -, libX11 -, libXi -, libcgroup -, pciutils -, psmisc -, pulseaudio -, systemd -, xorg -, wrapGAppsHook -}: - -buildGoPackage rec { - pname = "startdde"; - version = "5.0.1"; - - goPackagePath = "pkg.deepin.io/dde/startdde"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1xydmglydksy7hjlavf5pbfy0s0lndgavh8x3kg2mg7d36mbra43"; - }; - - goDeps = ./deps.nix; - - nativeBuildInputs = [ - pkgconfig - jq - wrapGAppsHook - deepin.setupHook - ]; - - buildInputs = [ - dde-api - go-dbus-factory - go-gir-generator - go-lib - alsaLib - dde-daemon - dde-dock - dde-file-manager - dde-kwin - dde-polkit-agent - dde-session-ui - deepin-desktop-schemas - deepin-turbo - glib - gnome3.dconf - gnome3.gnome-keyring - gnome3.libgnome-keyring - gtk3 - kmod - libX11 - libXi - libcgroup - pciutils - psmisc - pulseaudio - systemd - xorg.xdriinfo - ]; - - postPatch = '' - searchHardCodedPaths # debugging - - # Commented lines below indicates a doubt about how to fix the hard coded path - - fixPath $out /etc/X11 Makefile - #fixPath ? /etc/xdg/autostop autostop/autostop.go - fixPath ${coreutils} /bin/ls copyfile_test.go - fixPath $out /usr/share/startdde/auto_launch.json launch_group.go - #fixPath ? /usr/bin/kwin_no_scale main.go # not found on deepin linux and archlinux - fixPath $out /usr/share/startdde/memchecker.json memchecker/config.go - fixPath $out /usr/bin/startdde misc/00deepin-dde-env - fixPath ${dde-file-manager} /usr/bin/dde-file-manager misc/auto_launch/chinese.json - fixPath ${deepin-turbo} /usr/lib/deepin-turbo/booster-dtkwidget misc/auto_launch/chinese.json - fixPath ${dde-daemon} /usr/lib/deepin-daemon/dde-session-daemon misc/auto_launch/chinese.json misc/auto_launch/default.json - fixPath ${dde-dock} /usr/bin/dde-dock misc/auto_launch/chinese.json misc/auto_launch/default.json - fixPath ${dde-file-manager} /usr/bin/dde-desktop misc/auto_launch/chinese.json misc/auto_launch/default.json - fixPath $out /usr/bin/startdde misc/deepin-session - #fixPath ? /usr/lib/lightdm/config-error-dialog.sh misc/deepin-session # provided by lightdm on deepin linux - #fixPath ? /usr/sbin/lightdm-session misc/deepin-session # provided by lightdm on deepin linux - fixPath ${dde-session-ui} /usr/bin/dde-lock session.go - fixPath ${dde-session-ui} /usr/bin/dde-shutdown session.go - fixPath ${dde-session-ui} /usr/lib/deepin-daemon/dde-osd session.go - fixPath ${deepin-desktop-base} /etc/deepin-version session.go - fixPath ${gnome3.gnome-keyring} /usr/bin/gnome-keyring-daemon session.go - fixPath ${pulseaudio} /usr/bin/pulseaudio sound_effect.go - #fixPath ? /usr/lib/UIAppSched.hooks startmanager.go # not found anything about this - fixPath ${dde-session-ui} /usr/lib/deepin-daemon/dde-welcome utils.go - fixPath ${dde-polkit-agent} /usr/lib/polkit-1-dde/dde-polkit-agent watchdog/dde_polkit_agent.go - #fixPath ? /var/log/Xorg.0.log wm/driver.go - #fixPath ? /etc/deepin-wm-switcher/config.json wm/switcher_config.go # not present on nixos, deepin linux and archlinux - - substituteInPlace wm/driver.go --replace '/sbin/lsmod' "${kmod}/bin/lsmod" - - substituteInPlace session.go --replace 'LookPath("cgexec"' 'LookPath("${libcgroup}/bin/cgexec"' - substituteInPlace vm.go --replace 'Command("dde-wm-chooser"' 'Command("${dde-session-ui}/bin/dde-wm-chooser"' - substituteInPlace vm.go --replace 'Command("systemd-detect-virt"' 'Command("${systemd}/bin/systemd-detect-virt"' - substituteInPlace wm/card_info.go --replace 'Command("lspci"' 'Command("${pciutils}/bin/lspci"' - substituteInPlace wm/driver.go --replace 'Command("lspci"' 'Command("${pciutils}/bin/lspci"' - substituteInPlace wm/driver.go --replace 'Command("xdriinfo"' 'Command("${xorg.xdriinfo}/bin/xdriinfo"' - substituteInPlace wm/platform.go --replace 'Command("gsettings"' 'Command("${glib}/bin/gsettings"' - substituteInPlace wm/platform.go --replace 'Command("uname"' 'Command("${coreutils}/bin/uname"' - substituteInPlace wm/switcher.go --replace 'Command("killall"' 'Command("${psmisc}/bin/killall"' - ''; - - buildPhase = '' - make -C go/src/${goPackagePath} - ''; - - installPhase = '' - make install PREFIX="$out" -C go/src/${goPackagePath} - rm -rf $out/share/lightdm # this is uselesss for NixOS - remove-references-to -t ${go} $out/sbin/* - ''; - - postFixup = '' - searchHardCodedPaths $out # debugging - ''; - - passthru = { - updateScript = deepin.updateScript { inherit pname version src; }; - providedSessions = [ "deepin" ]; - }; - - meta = with stdenv.lib; { - description = "Starter of deepin desktop environment"; - homepage = "https://github.com/linuxdeepin/startdde"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/startdde/deps.nix b/pkgs/desktops/deepin/startdde/deps.nix deleted file mode 100644 index 8898b8c50fb..00000000000 --- a/pkgs/desktops/deepin/startdde/deps.nix +++ /dev/null @@ -1,30 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/cryptix/wav"; - fetch = { - type = "git"; - url = "https://github.com/cryptix/wav"; - rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44"; - sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6"; - }; - } - { - goPackagePath = "github.com/linuxdeepin/go-x11-client"; - fetch = { - type = "git"; - url = "https://github.com/linuxdeepin/go-x11-client"; - rev = "b5b01565d224d5ccd5a4143d9099acceb23e182a"; - sha256 = "1lnffjp8bqy6f8caw6drg1js6hny5w7432riqchcrcd4q85d94rs"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "daa7c04131f568e31c51927b359a2d197a357058"; - sha256 = "17gbfvb5iqyayzw0zd6q218zsbf7x74rflvn18wkxvsw95n1y54h"; - }; - } -] diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix deleted file mode 100644 index 0fcc2e9f9f7..00000000000 --- a/pkgs/desktops/deepin/udisks2-qt5/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, qmake -, qtbase -, deepin -}: - -mkDerivation rec { - pname = "udisks2-qt5"; - version = "5.0.3"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0c87ks9glwhk4m2s7kf7mb43q011yi6l3qjq2ammmfqwl8xal69a"; - }; - - nativeBuildInputs = [ - deepin.setupHook - qmake - ]; - - buildInputs = [ - qtbase - ]; - - postPatch = '' - searchHardCodedPaths # debugging - ''; - - qmakeFlags = [ - "QMAKE_PKGCONFIG_PREFIX=${placeholder "out"}" - ]; - - postFixup = '' - searchHardCodedPaths $out # debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "UDisks2 D-Bus interfaces binding for Qt5"; - homepage = "https://github.com/linuxdeepin/udisks2-qt5"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/pkgs/development/compilers/sagittarius-scheme/default.nix index 4b1358b7247..dcc3457fe11 100644 --- a/pkgs/development/compilers/sagittarius-scheme/default.nix +++ b/pkgs/development/compilers/sagittarius-scheme/default.nix @@ -16,10 +16,10 @@ let platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" in stdenv.mkDerivation rec { pname = "sagittarius-scheme"; - version = "0.9.6"; + version = "0.9.7"; src = fetchurl { url = "https://bitbucket.org/ktakashi/${pname}/downloads/sagittarius-${version}.tar.gz"; - sha256 = "03nvvvfd4gdlvq244zpnikxxajp6w8jj3ymw4bcq83x7zilb2imr"; + sha256 = "18pjj6f5qvixv5hbl1k4d3jqfcmi9qyx0gz0cjwrzpxa8brpwld8"; }; preBuild = '' # since we lack rpath during build, need to explicitly add build path diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix index eb431b9faf2..f6109398da8 100644 --- a/pkgs/development/coq-modules/gappalib/default.nix +++ b/pkgs/development/coq-modules/gappalib/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, which, coq, flocq }: stdenv.mkDerivation { - name = "coq${coq.coq-version}-gappalib-1.4.3"; + name = "coq${coq.coq-version}-gappalib-1.4.4"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38302/gappalib-coq-1.4.3.tar.gz"; - sha256 = "108k9dks04wbcqz38pf0zz11hz5imbzimpnkgjrk5gp1hifih370"; + url = "https://gforge.inria.fr/frs/download.php/file/38338/gappalib-coq-1.4.4.tar.gz"; + sha256 = "1ds9qp3ml07w5ali0rsczlwgdx4xcgasgbcnpi2lssgj1xpxgfpn"; }; nativeBuildInputs = [ which ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.8" "8.9" "8.10" "8.11" ]; + compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.8" "8.9" "8.10" "8.11" "8.12" ]; }; } diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 402c3e781ad..7db4992d1d6 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -235,7 +235,7 @@ let ''; preFixup = (args.preFixup or "") + '' - find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true + find $out/{bin,libexec,lib} -type f 2>/dev/null | xargs -r ${removeExpr removeReferences} || true ''; strictDeps = true; diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 9d3c7c3d573..de0a35b6934 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -211,8 +211,7 @@ let ''; preFixup = preFixup + '' - find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true - find $out/libexec -type f -exec ${removeExpr removeReferences} '{}' + || true + find $out/{bin,libexec,lib} -type f 2>/dev/null | xargs -r ${removeExpr removeReferences} || true ''; strictDeps = true; diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index e96a7c604c7..afb5dd9c5b6 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -1,10 +1,10 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; - version = "2.0.5-2020-08-05"; - rev = "2211f6f"; + version = "2.0.5-2020-08-09"; + rev = "e296f56"; isStable = true; - sha256 = "01adxmknq2xyb3w9sn8ilnar8181h7ksd9i80yrsbwzix5lwkn6m"; + sha256 = "0g4wvpmmrxj8ir6yi86gg93khy8ri7x4w091jihpxsmn670da21f"; extraMeta = { # this isn't precise but it at least stops the useless Hydra build platforms = with lib; filter (p: p != "aarch64-linux") (platforms.linux ++ platforms.darwin); diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index f08bbd0e972..cb0320c7c7c 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,8 +1,8 @@ { self, callPackage }: callPackage ./default.nix { inherit self; - version = "2.1.0-2020-08-05"; - rev = "10ddae7"; + version = "2.1.0-2020-08-27"; + rev = "ff1e72a"; isStable = false; - sha256 = "1lmjs0gz9vgbhh5f45jvvibpj7f3sz81r8cz4maln9yhc67f2zmk"; + sha256 = "0rlh5y48jbxnamr3a5i3szzh7y9ycvq052rw6m82gdhrb1jlamdz"; } diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index 03a3b953709..dcfa41cc308 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -6,67 +6,81 @@ }: let - envs = let - inherit python; - pythonEnv = python.withPackages(ps: with ps; [ ]); - pythonVirtualEnv = python.withPackages(ps: with ps; [ virtualenv ]); - in { - # Plain Python interpreter - plain = rec { - env = python; - interpreter = env.interpreter; - is_venv = "False"; - is_nixenv = "False"; - is_virtualenv = "False"; - }; - } // lib.optionalAttrs (!python.isPyPy) { - # Use virtualenv from a Nix env. - nixenv-virtualenv = rec { - env = runCommand "${python.name}-virtualenv" {} '' - ${pythonVirtualEnv.interpreter} -m virtualenv $out - ''; - interpreter = "${env}/bin/${python.executable}"; - is_venv = "False"; - is_nixenv = "True"; - is_virtualenv = "True"; - }; - } // lib.optionalAttrs (python.implementation != "graal") { - # Python Nix environment (python.buildEnv) - nixenv = rec { - env = pythonEnv; - interpreter = env.interpreter; - is_venv = "False"; - is_nixenv = "True"; - is_virtualenv = "False"; - }; - } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec { - # Venv built using plain Python - # Python 2 does not support venv - # TODO: PyPy executable name is incorrect, it should be pypy-c or pypy-3c instead of pypy and pypy3. - plain-venv = rec { - env = runCommand "${python.name}-venv" {} '' - ${python.interpreter} -m venv $out - ''; - interpreter = "${env}/bin/${python.executable}"; - is_venv = "True"; - is_nixenv = "False"; - is_virtualenv = "False"; + environmentTests = let + envs = let + inherit python; + pythonEnv = python.withPackages(ps: with ps; [ ]); + pythonVirtualEnv = python.withPackages(ps: with ps; [ virtualenv ]); + in { + # Plain Python interpreter + plain = rec { + env = python; + interpreter = env.interpreter; + is_venv = "False"; + is_nixenv = "False"; + is_virtualenv = "False"; + }; + } // lib.optionalAttrs (!python.isPyPy) { + # Use virtualenv from a Nix env. + nixenv-virtualenv = rec { + env = runCommand "${python.name}-virtualenv" {} '' + ${pythonVirtualEnv.interpreter} -m virtualenv $out + ''; + interpreter = "${env}/bin/${python.executable}"; + is_venv = "False"; + is_nixenv = "True"; + is_virtualenv = "True"; + }; + } // lib.optionalAttrs (python.implementation != "graal") { + # Python Nix environment (python.buildEnv) + nixenv = rec { + env = pythonEnv; + interpreter = env.interpreter; + is_venv = "False"; + is_nixenv = "True"; + is_virtualenv = "False"; + }; + } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec { + # Venv built using plain Python + # Python 2 does not support venv + # TODO: PyPy executable name is incorrect, it should be pypy-c or pypy-3c instead of pypy and pypy3. + plain-venv = rec { + env = runCommand "${python.name}-venv" {} '' + ${python.interpreter} -m venv $out + ''; + interpreter = "${env}/bin/${python.executable}"; + is_venv = "True"; + is_nixenv = "False"; + is_virtualenv = "False"; + }; + + } // lib.optionalAttrs (python.pythonAtLeast "3.8") { + # Venv built using Python Nix environment (python.buildEnv) + # TODO: Cannot create venv from a nix env + # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1. + nixenv-venv = rec { + env = runCommand "${python.name}-venv" {} '' + ${pythonEnv.interpreter} -m venv $out + ''; + interpreter = "${env}/bin/${pythonEnv.executable}"; + is_venv = "True"; + is_nixenv = "True"; + is_virtualenv = "False"; + }; }; - } // lib.optionalAttrs (python.pythonAtLeast "3.8") { - # Venv built using Python Nix environment (python.buildEnv) - # TODO: Cannot create venv from a nix env - # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1. - nixenv-venv = rec { - env = runCommand "${python.name}-venv" {} '' - ${pythonEnv.interpreter} -m venv $out - ''; - interpreter = "${env}/bin/${pythonEnv.executable}"; - is_venv = "True"; - is_nixenv = "True"; - is_virtualenv = "False"; - }; - }; + testfun = name: attrs: runCommand "${python.name}-tests-${name}" ({ + inherit (python) pythonVersion; + } // attrs) '' + cp -r ${./tests/test_environments} tests + chmod -R +w tests + substituteAllInPlace tests/test_python.py + ${attrs.interpreter} -m unittest discover --verbose tests #/test_python.py + mkdir $out + touch $out/success + ''; + + in lib.mapAttrs testfun envs; # All PyPy package builds are broken at the moment integrationTests = lib.optionalAttrs (python.pythonAtLeast "3.7" && (!python.isPyPy)) rec { @@ -76,15 +90,6 @@ let }; }; - testfun = name: attrs: runCommand "${python.name}-tests-${name}" ({ - inherit (python) pythonVersion; - } // attrs) '' - cp -r ${./tests} tests - chmod -R +w tests - substituteAllInPlace tests/test_python.py - ${attrs.interpreter} -m unittest discover --verbose tests #/test_python.py - mkdir $out - touch $out/success - ''; -in lib.mapAttrs testfun envs // integrationTests + +in environmentTests // integrationTests diff --git a/pkgs/development/interpreters/python/tests/test_python.py b/pkgs/development/interpreters/python/tests/test_environments/test_python.py similarity index 100% rename from pkgs/development/interpreters/python/tests/test_python.py rename to pkgs/development/interpreters/python/tests/test_environments/test_python.py diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index fb33743dc9a..0c708cd3171 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2020.08.1"; + version = "2020.08.2"; src = fetchurl { url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "1jwlqppm2g6ivzpipkcyihsxzsii3qyx1f35n7wj5dsf99b3hkfm"; + sha256 = "16qsq6alvk2x44x39j2fzxigvm5cvmz85i0nkjcw0wz29yyf8lch"; }; buildInputs = [ icu zlib gmp perl ]; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index 93b42d2b8e1..3f5f7afcfed 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2020.08.1"; + version = "2020.08.2"; src = fetchurl { - url = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "0pxmg22dx6rhfgrxq4gbwqf6d2nahw6iprjvrg8brkbcbyj3ryhd"; + url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz"; + sha256 = "14zr1swprxl284k0h1w72pcypj24sga15170ylaqjb8wxy8h1mqw"; }; buildInputs = [ perl ]; diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index fac55b60651..32405d6a525 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -694,18 +694,18 @@ in rec { pt_BR = buildOfficialDict { language = "pt_BR"; - version = "20090702-0"; + version = "20131030-12-0"; fullName = "Brazilian Portuguese"; filename = "aspell6"; - sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p"; + sha256 = "1xqlpk21s93c6blkdnpk7l62q9fxjvzdv2x86chl8p2x1gdrj3gb"; }; pt_PT = buildOfficialDict { language = "pt_PT"; - version = "20070510-0"; + version = "20190329-1-0"; fullName = "Portuguese"; filename = "aspell6"; - sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq"; + sha256 = "0ld0d0ily4jqifjfsxfv4shbicz6ymm2gk56fq9gbzra1j4qnw75"; }; qu = buildOfficialDict { diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix index 3522ff231ab..749005e09a9 100644 --- a/pkgs/development/libraries/ethash/default.nix +++ b/pkgs/development/libraries/ethash/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "ethash"; - version = "0.4.4"; + version = "0.5.2"; src = fetchFromGitHub { owner = "chfast"; repo = "ethash"; rev = "v${version}"; - sha256 = "1gfs8s4nv2ikkn3rhzifr0dx5m0c1kpnhmzf8x6zlwhw3qwlc98w"; + sha256 = "0shr3m33raxy9j2mpm3q9mdbchs3nhgfaywidyxgmwqaiw1xpyif"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index c00e8035f18..14f822432ee 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -2,7 +2,10 @@ , fetchFromGitHub , meson , ninja -, pkgconfig +, pkg-config +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 , wayland , gtk3 , gobject-introspection @@ -10,30 +13,39 @@ stdenv.mkDerivation rec { pname = "gtk-layer-shell"; - version = "0.1.0"; + version = "0.2.0"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitHub { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${version}"; - sha256 = "1fwvlbwp5w1zly6mksvlzbx18ikq4bh7pdj9q0k94qlj6x2zdwg8"; + sha256 = "0kas84z44p3vz92sljbnahh43wfj69knqsy1za729j8phrlwqdmg"; }; nativeBuildInputs = [ - meson ninja pkgconfig + meson + ninja + pkg-config + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 ]; buildInputs = [ - wayland gtk3 gobject-introspection + wayland + gtk3 ]; mesonFlags = [ - "-Dout=${placeholder "out"}" + "-Ddocs=true" ]; meta = with stdenv.lib; { description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol"; - license = licenses.mit; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ eonpatapon ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index d9139ec1d82..88f32866b0d 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "hsqldb"; - version = "2.5.0"; + version = "2.5.1"; underscoreMajMin = stdenv.lib.strings.replaceChars ["."] ["_"] (stdenv.lib.versions.majorMinor version); src = fetchurl { url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip"; - sha256 = "0s64w7qq5vayrzcmdhrdfmd6iqqv6x6fpiq9lpy2gva3dckv3q6j"; + sha256 = "0yd9px85y036bp3q1assj3fgaykxrwnhnc7cbjgic39cykfy5hrg"; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index f48c4821d92..5928d99b6c2 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "lombok-1.18.10"; + name = "lombok-1.18.12"; src = fetchurl { url = "https://projectlombok.org/downloads/${name}.jar"; - sha256 = "1ymjwxg01dq8qq89hx23yvk5h46hwfb8ihbqbvabmz1vh9afjdi8"; + sha256 = "01jl6i5wzjxyk36fcq6ji90x9h143gvnwhv86cbkqaxhxh41af29"; }; buildCommand = '' diff --git a/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch b/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch index ffc7edadfab..f82bf828e8e 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch +++ b/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch @@ -21,14 +21,14 @@ index 44fbacd..6b5abf5 100644 - if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH - daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); - if (daemon.isEmpty()) { -- qWarning() << "kdesud daemon not found."; +- qCWarning(KSU_LOG) << "kdesud daemon not found."; + QString daemon = QFile::decodeName("/run/wrappers/bin/kdesud"); + if (!QFile::exists(daemon)) { // if not in wrappers + daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud"); + if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH + daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); + if (daemon.isEmpty()) { -+ qWarning() << "kdesud daemon not found."; ++ qCWarning(KSU_LOG) << "kdesud daemon not found."; + } } } diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index 2b3ef8c99c8..d6c90ee172b 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libaacs"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { url = "http://get.videolan.org/libaacs/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1zhjdcph8sqx7ak35s22kc736icwq135jlypggkp6vqyyygb3xlk"; + sha256 = "11skjqjlldmbjkyxdcz4fmcn6y4p95r1xagbcnjy4ndnzf0l723d"; }; buildInputs = [ libgcrypt libgpgerror ]; diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix new file mode 100644 index 00000000000..ed19fab6d99 --- /dev/null +++ b/pkgs/development/libraries/libthreadar/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = "1.3.0"; + pname = "libthreadar"; + + src = fetchurl { + url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz"; + sha256 = "0g2wxykawlsj6ma9slbbk0bxynqvmkwhaln2fiwc21x7nhjvpn9z"; + }; + + outputs = [ "out" "dev" ]; + + configureFlags = [ + "--disable-build-html" + ]; + + postInstall = '' + # Disable html help + rm -r "$out"/share + ''; + + meta = { + homepage = "http://libthreadar.sourceforge.net/"; + description = '' + Libthreadar is a C++ library providing a small set of C++ classes to manipulate + threads in a very simple and efficient way from your C++ code. + ''; + maintainers = with maintainers; [ izorkin ]; + license = licenses.lgpl3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 7539d45627f..308fadbdfd8 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.4.2"; + version = "1.4.4"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "05mgrdzacn9kdpr68r5j0cvsvl54s52glnsc1ww9rcxx6p7hq1ly"; + sha256 = "0y4m29wyvhhxb7fap9z07zwgcqlr4ifwynf8a7yp5ldjpzfzxpix"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index ae3392aeb12..48ed6cf4680 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -84,9 +84,11 @@ stdenv.mkDerivation rec { "-DENABLE_SHARED=ON" "-DHIGH_BIT_DEPTH=OFF" "-DENABLE_HDR10_PLUS=OFF" + ] ++ stdenv.lib.optionals is64bit [ "-DEXTRA_LIB=${libx265-10}/lib/libx265.a;${libx265-12}/lib/libx265.a" "-DLINKED_10BIT=ON" "-DLINKED_12BIT=ON" + ] ++ [ (mkFlag cliSupport "ENABLE_CLI") ] ++ cmakeFlagsAll; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index bb14f562d70..f9c91c3a8a6 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -691,6 +691,74 @@ lua-messagepack = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; +lua-resty-http = buildLuarocksPackage { + pname = "lua-resty-http"; + version = "0.15-0"; + + src = fetchurl { + url = mirror://luarocks/lua-resty-http-0.15-0.src.rock; + sha256 = "1121abcz9y8kis2wdg7i1m75y8lplk3k49v02y804bywbl2km4fz"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/ledgetech/lua-resty-http"; + description = "Lua HTTP client cosocket driver for OpenResty / ngx_lua."; + license.fullName = "2-clause BSD"; + }; +}; +lua-resty-jwt = buildLuarocksPackage { + pname = "lua-resty-jwt"; + version = "0.2.2-0"; + + src = fetchurl { + url = mirror://luarocks/lua-resty-jwt-0.2.2-0.src.rock; + sha256 = "1a4wwiwcjwgr59g2940a2h0i6n1c7xjy2px5bls3x5br4shwhswa"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/cdbattags/lua-resty-jwt"; + description = "JWT for ngx_lua and LuaJIT."; + license.fullName = "Apache License Version 2"; + }; +}; +lua-resty-openidc = buildLuarocksPackage { + pname = "lua-resty-openidc"; + version = "1.7.2-1"; + + src = fetchurl { + url = mirror://luarocks/lua-resty-openidc-1.7.2-1.src.rock; + sha256 = "01mya69r4fncfrpqh5pn2acg18q3slds8zm976qgkjby0pzwzzw7"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua lua-resty-http lua-resty-session lua-resty-jwt ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/zmartzone/lua-resty-openidc"; + description = "A library for NGINX implementing the OpenID Connect Relying Party (RP) and the OAuth 2.0 Resource Server (RS) functionality"; + license.fullName = "Apache 2.0"; + }; +}; +lua-resty-session = buildLuarocksPackage { + pname = "lua-resty-session"; + version = "3.6-1"; + + src = fetchurl { + url = mirror://luarocks/lua-resty-session-3.6-1.src.rock; + sha256 = "1r5626x247d1vi5bzqfk11bl4d5c39h1iqj6mgndnwpnz43cag5i"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/bungle/lua-resty-session"; + description = "Session Library for OpenResty – Flexible and Secure"; + license.fullName = "BSD"; + }; +}; lua-term = buildLuarocksPackage { pname = "lua-term"; version = "0.7-1"; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 71c044a8cc1..e178e066a38 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -4,11 +4,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "1w09wllls4rp1abq0awffxf69dn0xciy6hsqz413ing5r151wjxr"; + sha256 = "0l6q0z5ghhy0djfscb2i2xg4dpmxs4xkwh16kc473cmb4hsxsmyk"; }; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/mirage-stack/default.nix b/pkgs/development/ocaml-modules/mirage-stack/default.nix index 64168716399..528ea68d985 100644 --- a/pkgs/development/ocaml-modules/mirage-stack/default.nix +++ b/pkgs/development/ocaml-modules/mirage-stack/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "mirage-stack"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { url = "https://github.com/mirage/mirage-stack/releases/download/v${version}/mirage-stack-v${version}.tbz"; - sha256 = "1xdy59bxnki1r0jwm3s8fwarhhbxr0lsqqiag5b1j41hciiqp9jq"; + sha256 = "1y110i4kjr03b0ji3q5h0bi3n3q8mdkfflb3fyq5rvpi5l45vvdb"; }; propagatedBuildInputs = [ mirage-protocols ]; diff --git a/pkgs/development/ocaml-modules/posix/base.nix b/pkgs/development/ocaml-modules/posix/base.nix new file mode 100644 index 00000000000..a6fe690ebcc --- /dev/null +++ b/pkgs/development/ocaml-modules/posix/base.nix @@ -0,0 +1,26 @@ +{ lib, buildDunePackage, fetchFromGitHub +, ctypes, integers +}: + +buildDunePackage rec { + pname = "posix-base"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-posix"; + rev = "v${version}"; + sha256 = "18px8hfqcfy2lk8105ki3hrxxigs44gs046ba0fqda6wzd0hr82b"; + }; + + useDune2 = true; + + propagatedBuildInputs = [ ctypes integers ]; + + meta = { + homepage = "https://www.liquidsoap.info/ocaml-posix/"; + description = "Base module for the posix bindings"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/posix/socket.nix b/pkgs/development/ocaml-modules/posix/socket.nix new file mode 100644 index 00000000000..69a469bbece --- /dev/null +++ b/pkgs/development/ocaml-modules/posix/socket.nix @@ -0,0 +1,16 @@ +{ lib, buildDunePackage, posix-base }: + +buildDunePackage { + pname = "posix-socket"; + + inherit (posix-base) version src useDune2; + + propagatedBuildInputs = [ posix-base ]; + + doCheck = true; + + meta = posix-base.meta // { + description = "Bindings for posix sockets"; + }; + +} diff --git a/pkgs/development/ocaml-modules/posix/types.nix b/pkgs/development/ocaml-modules/posix/types.nix new file mode 100644 index 00000000000..2512fe892c1 --- /dev/null +++ b/pkgs/development/ocaml-modules/posix/types.nix @@ -0,0 +1,15 @@ +{ lib, buildDunePackage, posix-base }: + +buildDunePackage { + pname = "posix-types"; + + inherit (posix-base) version src useDune2; + + minimumOCamlVersion = "4.03"; + + propagatedBuildInputs = [ posix-base ]; + + meta = posix-base.meta // { + description = "Bindings for the types defined in "; + }; +} diff --git a/pkgs/development/ocaml-modules/webbrowser/default.nix b/pkgs/development/ocaml-modules/webbrowser/default.nix new file mode 100644 index 00000000000..463bfbc79f9 --- /dev/null +++ b/pkgs/development/ocaml-modules/webbrowser/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg +, astring, bos, cmdliner, rresult +}: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-webbrowser-${version}"; + version = "0.6.1"; + src = fetchurl { + url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz"; + sha256 = "137a948bx7b71zfv4za3hhznrn5lzbbrgzjy0das83zms508isx3"; + }; + + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = []; + propagatedBuildInputs = [ astring bos cmdliner rresult ]; + + inherit (topkg) buildPhase installPhase; + + meta = { + description = "Open and reload URIs in browsers from OCaml"; + homepage = "https://erratique.ch/software/webbrowser"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix new file mode 100644 index 00000000000..5d960b5e92e --- /dev/null +++ b/pkgs/development/python-modules/afdko/default.nix @@ -0,0 +1,55 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, python +, fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens +, brotli, fontmath, mutatormath, booleanoperations +, ufoprocessor, ufonormalizer, psautohint +, setuptools_scm +, pytest +}: + +buildPythonPackage rec { + pname = "afdko"; + version = "3.5.0"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wid4l70bxm297xgayyrgw5glhp6n92gh4sz1nd4rncgf1ziz8ck"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ + booleanoperations + fonttools + lxml # fonttools[lxml], defcon[lxml] extra + fs # fonttools[ufo] extra + unicodedata2 # fonttools[unicode] extra + brotlipy # fonttools[woff] extra + zopfli # fonttools[woff] extra + fontpens + brotli + defcon + fontmath + mutatormath + ufoprocessor + ufonormalizer + psautohint + ]; + + # tests are broken on non x86_64 + # https://github.com/adobe-type-tools/afdko/issues/1163 + # https://github.com/adobe-type-tools/afdko/issues/1216 + doCheck = stdenv.isx86_64; + checkInputs = [ pytest ]; + checkPhase = '' + PATH="$PATH:$out/bin" py.test + ''; + + meta = with stdenv.lib; { + description = "Adobe Font Development Kit for OpenType"; + homepage = "https://adobe-type-tools.github.io/afdko/"; + license = licenses.asl20; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 596579f8148..5d4b9bcb5e2 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -20,11 +20,13 @@ buildPythonPackage rec { cython ]; + propagatedBuildInputs = [ + numpy + ]; + checkInputs = [ - cython hypothesis - numpy pytest ]; diff --git a/pkgs/development/python-modules/booleanoperations/default.nix b/pkgs/development/python-modules/booleanoperations/default.nix new file mode 100644 index 00000000000..c747df90f5a --- /dev/null +++ b/pkgs/development/python-modules/booleanoperations/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, fetchPypi +, fonttools, fs, pyclipper, defcon, fontpens +, setuptools_scm, pytest +}: + +buildPythonPackage rec { + pname = "booleanOperations"; + version = "0.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1f41lb19m8azchl1aqz6j5ycbspb8jsf1cnn42hlydxd68f85ylc"; + extension = "zip"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ + fonttools + fs + pyclipper + defcon + fontpens + ]; + + checkInputs = [ pytest ]; + + meta = with lib; { + description = "Boolean operations on paths"; + homepage = "https://github.com/typemytype/booleanOperations"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index 07547b280f5..1abd3f4ed20 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -1,4 +1,6 @@ -{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, nose }: +{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, nose +, fetchpatch +}: buildPythonPackage rec { pname = "credstash"; @@ -9,6 +11,12 @@ buildPythonPackage rec { sha256 = "6c04e8734ef556ab459018da142dd0b244093ef176b3be5583e582e9a797a120"; }; + patches = [ + (fetchpatch { + url = "https://github.com/fugue/credstash/commit/9c02ee43ed6e37596cafbca2fe80c532ec19d2d8.patch"; + sha256 = "dlybrpfLK+PqwWWhH9iXgXHYysZGmcZAFGWNOwsG0xA="; + }) + ]; # The install phase puts an executable and a copy of the library it imports in # bin/credstash and bin/credstash.py, despite the fact that the library is also # installed to lib/python/site-packages/credstash.py. diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index 920fc68e1bb..e8d2731eb55 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -3,6 +3,7 @@ , fetchPypi , mock , jsonpickle +, mmh3 , ordered-set , numpy , pytestCheckHook @@ -24,14 +25,9 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # skipped tests require murmur module - "test_prep_str_murmur3_64bit" - "test_prep_str_murmur3_128bit" - ]; - propagatedBuildInputs = [ jsonpickle + mmh3 ordered-set ]; diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix new file mode 100644 index 00000000000..25c59029992 --- /dev/null +++ b/pkgs/development/python-modules/defcon/default.nix @@ -0,0 +1,35 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, fonttools +, pytest, pytestrunner, lxml, fs, unicodedata2, fontpens +}: + +buildPythonPackage rec { + pname = "defcon"; + version = "0.7.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lfqsvxmq1j0nvp26gidnqkj1dyxv7jalc6i7fz1r3nc7niflrqr"; + extension = "zip"; + }; + + propagatedBuildInputs = [ + fonttools + ]; + + checkInputs = [ + pytest + pytestrunner + lxml + fs + unicodedata2 + fontpens + ]; + + meta = with lib; { + description = "A set of UFO based objects for use in font editing applications"; + homepage = "https://github.com/robotools/defcon"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index 2d23343e5ca..32cb213af4f 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -1,5 +1,13 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder -, pytest, pytestcov, mock, Mako, decorator +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytest +, pytestcov +, mock +, Mako +, decorator +, stevedore }: buildPythonPackage rec { @@ -27,7 +35,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestcov mock Mako ]; - propagatedBuildInputs = [ decorator ]; + propagatedBuildInputs = [ decorator stevedore ]; meta = with stdenv.lib; { description = "A caching front-end based on the Dogpile lock"; diff --git a/pkgs/development/python-modules/fontmath/default.nix b/pkgs/development/python-modules/fontmath/default.nix new file mode 100644 index 00000000000..7a23abdd037 --- /dev/null +++ b/pkgs/development/python-modules/fontmath/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi +, fonttools +, pytest, pytestrunner +}: + +buildPythonPackage rec { + pname = "fontMath"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "09xdqdjyjlx5k9ymi36d7hkgvn55zzjzd65l2yqidkfazlmh14ss"; + extension = "zip"; + }; + + propagatedBuildInputs = [ fonttools ]; + checkInputs = [ pytest pytestrunner ]; + + meta = with lib; { + description = "A collection of objects that implement fast font, glyph, etc. math"; + homepage = "https://github.com/robotools/fontMath/"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix new file mode 100644 index 00000000000..dd341fef8b3 --- /dev/null +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -0,0 +1,39 @@ +{ lib, buildPythonPackage, fetchPypi, python +, fonttools, lxml, fs, unicodedata2 +, defcon, fontpens, fontmath, booleanoperations +, pytest +}: + +buildPythonPackage rec { + pname = "fontParts"; + version = "0.9.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hwzdppmrrw1xz49x36h6mcsrwya1f3zpqrc206y73j4pbn7fh0k"; + extension = "zip"; + }; + + propagatedBuildInputs = [ + booleanoperations + fonttools + unicodedata2 # fonttools[unicode] extra + lxml # fonttools[lxml] extra + fs # fonttools[ufo] extra + defcon + fontpens # defcon[pens] extra + fontmath + ]; + + checkPhase = '' + ${python.interpreter} Lib/fontParts/fontshell/test.py + ''; + checkInputs = [ pytest ]; + + meta = with lib; { + description = "An API for interacting with the parts of fonts during the font development process."; + homepage = "https://github.com/robotools/fontParts"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/fontpens/default.nix b/pkgs/development/python-modules/fontpens/default.nix new file mode 100644 index 00000000000..02adb3b0642 --- /dev/null +++ b/pkgs/development/python-modules/fontpens/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchPypi, fonttools }: + +buildPythonPackage rec { + pname = "fontPens"; + version = "0.2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1za15dzsnymq6d9x7xdfqwgw4a3003wj75fn2crhyidkfd2s3nd6"; + extension = "zip"; + }; + + propagatedBuildInputs = [ fonttools ]; + + # can't run normal tests due to circular dependency with fontParts + doCheck = false; + pythonImportsCheck = [ "fontPens" ] ++ (builtins.map (s: "fontPens." + s) [ + "angledMarginPen" + "digestPointPen" + "flattenPen" + "guessSmoothPointPen" + "marginPen" + "penTools" + "printPen" + "printPointPen" + "recordingPointPen" + "thresholdPen" + "thresholdPointPen" + "transformPointPen" + ]); + + meta = with lib; { + description = "A collection of classes implementing the pen protocol for manipulating glyphs"; + homepage = "https://github.com/robotools/fontPens"; + license = licenses.bsd3; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 9fe285a8e69..a1433d08bd0 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -1,38 +1,70 @@ { lib , buildPythonPackage -, fetchPypi -, isPy27 -, numpy +, fetchFromGitHub +, pythonOlder +, brotlipy +, zopfli +, fs +, lxml +, scipy +, munkres +, unicodedata2 +, sympy +, matplotlib +, reportlab , pytest -, pytestrunner +, pytest-randomly , glibcLocales }: buildPythonPackage rec { pname = "fonttools"; - version = "4.13.0"; - disabled = isPy27; + version = "4.14.0"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "63987cd374c39a75146748f8be8637634221e53fef15cdf76f17777676d8545a"; - extension = "zip"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "0aiaxjg2v2391gxnhp4nvmgfb3ygm6x7n080s5mnkfjq2bq319in"; }; - buildInputs = [ - numpy - ]; - + # all dependencies are optional, but + # we run the checks with them checkInputs = [ pytest - pytestrunner + pytest-randomly glibcLocales + # etree extra + lxml + # ufo extra + fs + # woff extra + brotlipy + zopfli + # unicode extra + unicodedata2 + # interpolatable extra + scipy + munkres + # symfont + sympy + # varLib + matplotlib + # pens + reportlab ]; preCheck = '' export LC_ALL="en_US.UTF-8" ''; + # avoid timing issues with timestamps in subset_test.py and ttx_test.py + checkPhase = '' + pytest Tests fontTools \ + -k 'not ttcompile_timestamp_calcs and not recalc_timestamp' + ''; + meta = { homepage = "https://github.com/fonttools/fonttools"; description = "A library to manipulate font files from Python"; diff --git a/pkgs/development/python-modules/lml/default.nix b/pkgs/development/python-modules/lml/default.nix new file mode 100644 index 00000000000..c1320eef04c --- /dev/null +++ b/pkgs/development/python-modules/lml/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, mock +}: + +buildPythonPackage rec { + pname = "lml"; + version = "0.0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "6luoF7Styen1whclzSR1+RKTO34t/fB5Ku2AB3FU9j8="; + }; + + checkInputs = [ + nose + mock + ]; + + checkPhase = "nosetests"; + + meta = { + description = "Load me later. A lazy plugin management system for Python"; + homepage = "http://lml.readthedocs.io/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/python-modules/mmh3/default.nix b/pkgs/development/python-modules/mmh3/default.nix new file mode 100644 index 00000000000..8ac24188003 --- /dev/null +++ b/pkgs/development/python-modules/mmh3/default.nix @@ -0,0 +1,23 @@ +{ lib +, fetchPypi +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "mmh3"; + version = "2.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0265pvfbcsijf51szsh14qk3l3zgs0rb5rbrw11zwan52yi0jlhq"; + }; + + pythonImportsCheck = [ "mmh3" ]; + + meta = with lib; { + description = "Python wrapper for MurmurHash3, a set of fast and robust hash functions"; + homepage = "https://pypi.org/project/mmh3/"; + license = licenses.cc0; + maintainers = [ maintainers.danieldk ]; + }; +} diff --git a/pkgs/development/python-modules/mutatormath/default.nix b/pkgs/development/python-modules/mutatormath/default.nix new file mode 100644 index 00000000000..9336dbf354a --- /dev/null +++ b/pkgs/development/python-modules/mutatormath/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi +, defcon, fontmath +, unicodedata2, fs +}: + +buildPythonPackage rec { + pname = "MutatorMath"; + version = "3.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0r1qq45np49x14zz1zwkaayqrn7m8dn2jlipjldg2ihnmpzw29w1"; + extension = "zip"; + }; + + propagatedBuildInputs = [ fontmath unicodedata2 defcon ]; + checkInputs = [ unicodedata2 fs ]; + + meta = with lib; { + description = "Piecewise linear interpolation in multiple dimensions with multiple, arbitrarily placed, masters"; + homepage = "https://github.com/LettError/MutatorMath"; + license = licenses.bsd3; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index 939eeafd9b9..bb2a20cf62f 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 , pythonOlder -, funcsigs , setuptools_scm +, importlib-metadata +, packaging # Check Inputs , pytestCheckHook , numpy @@ -24,9 +24,10 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; - propagatedBuildInputs = [ - setuptools_scm - ] ++ lib.optional isPy27 funcsigs; + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ packaging ] + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; # Test suite explicitly requires pytest checkInputs = [ diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix new file mode 100644 index 00000000000..0f89069c7d8 --- /dev/null +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -0,0 +1,40 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, fonttools, lxml, fs +, setuptools_scm +, pytest, pytestcov, pytest_xdist, pytest-randomly +}: + +buildPythonPackage rec { + pname = "psautohint"; + version = "2.1.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "adobe-type-tools"; + repo = pname; + sha256 = "1k1rx1adqxdxj5v3788lwnvygylp73sps1p0q44hws2vmsag2s8r"; + rev = "v${version}"; + fetchSubmodules = true; # data dir for tests + }; + + postPatch = '' + echo '#define PSAUTOHINT_VERSION "${version}"' > libpsautohint/src/version.h + sed -i '/use_scm_version/,+3d' setup.py + sed -i '/setup(/a \ version="${version}",' setup.py + ''; + + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ fonttools lxml fs ]; + + checkInputs = [ pytest pytestcov pytest_xdist pytest-randomly ]; + checkPhase = "pytest tests"; + + meta = with lib; { + description = "Script to normalize the XML and other data inside of a UFO"; + homepage = "https://github.com/adobe-type-tools/psautohint"; + license = licenses.bsd3; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/pyexcel-io/default.nix b/pkgs/development/python-modules/pyexcel-io/default.nix new file mode 100644 index 00000000000..8a788402b49 --- /dev/null +++ b/pkgs/development/python-modules/pyexcel-io/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, lml +}: + +buildPythonPackage rec { + pname = "pyexcel-io"; + version = "0.5.20"; + + src = fetchPypi { + inherit pname version; + sha256 = "CN/jlVO5ljWbFD3j2exD4ZbxE41HyrtzrwShaCG4TXk="; + }; + + propagatedBuildInputs = [ + lml + ]; + + # Tests depend on stuff that depends on this. + doCheck = false; + + pythonImportsCheck = [ "pyexcel_io" ]; + + meta = { + description = "One interface to read and write the data in various excel formats, import the data into and export the data from databases"; + homepage = "http://docs.pyexcel.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/python-modules/pyexcel-ods/default.nix b/pkgs/development/python-modules/pyexcel-ods/default.nix new file mode 100644 index 00000000000..9e5b32ea867 --- /dev/null +++ b/pkgs/development/python-modules/pyexcel-ods/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyexcel-io +, odfpy +, nose +, pyexcel +, pyexcel-xls +, psutil +}: + +buildPythonPackage rec { + pname = "pyexcel-ods"; + version = "0.5.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "O+Uv2KrdvYvJKG9+sUj0VT1MlyUtaVw6nse5XmZmoiM="; + }; + + propagatedBuildInputs = [ + pyexcel-io + odfpy + ]; + + checkInputs = [ + nose + pyexcel + pyexcel-xls + psutil + ]; + + checkPhase = "nosetests"; + + meta = { + description = "Plug-in to pyexcel providing the capbility to read, manipulate and write data in ods formats using odfpy"; + homepage = "http://docs.pyexcel.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/python-modules/pyexcel-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix new file mode 100644 index 00000000000..2dd4533c2a9 --- /dev/null +++ b/pkgs/development/python-modules/pyexcel-xls/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyexcel-io +, xlrd +, xlwt +, nose +, pyexcel +, mock +}: + +buildPythonPackage rec { + pname = "pyexcel-xls"; + version = "0.5.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "1Wyt6gpmBoRFaXbZgFJVTTu+KnivxfmpHIaR9iZghVU="; + }; + + propagatedBuildInputs = [ + pyexcel-io + xlrd + xlwt + ]; + + checkInputs = [ + nose + pyexcel + mock + ]; + + checkPhase = "nosetests"; + + meta = { + description = "A wrapper library to read, manipulate and write data in xls using xlrd and xlwt"; + homepage = "http://docs.pyexcel.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/python-modules/pyexcel/default.nix b/pkgs/development/python-modules/pyexcel/default.nix new file mode 100644 index 00000000000..71219c32ae5 --- /dev/null +++ b/pkgs/development/python-modules/pyexcel/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, lml +, pyexcel-io +, texttable +, nose +}: + +buildPythonPackage rec { + pname = "pyexcel"; + version = "0.6.4"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "pPNYnimHhW7SL6X6OLwagZoadTD7IdUSbO7vAqQPQu8="; + }; + + propagatedBuildInputs = [ + lml + pyexcel-io + texttable + ]; + + checkInputs = [ + nose + ]; + + # Tests depend on pyexcel-xls & co. causing circular dependency. + # https://github.com/pyexcel/pyexcel/blob/dev/tests/requirements.txt + doCheck = false; + + pythonImportsCheck = [ "pyexcel" ]; + + checkPhase = "nosetests"; + + meta = { + description = "Single API for reading, manipulating and writing data in csv, ods, xls, xlsx and xlsm files"; + homepage = "http://docs.pyexcel.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/python-modules/pyipp/default.nix b/pkgs/development/python-modules/pyipp/default.nix index cf6b67c548b..98bb6360ce5 100644 --- a/pkgs/development/python-modules/pyipp/default.nix +++ b/pkgs/development/python-modules/pyipp/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "pyipp"; - version = "0.10.1"; + version = "0.11.0"; disabled = isPy27; src = fetchFromGitHub { owner = "ctalkington"; repo = "python-ipp"; rev = version; - sha256 = "0y9mkrx66f4m77jzfgdgmvlqismvimb6hm61j2va7zapm8dyabvr"; + sha256 = "0ar3mkyfa9qi3av3885bvacpwlxh420if9ymdj8i4x06ymzc213d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix new file mode 100644 index 00000000000..c4523ac728c --- /dev/null +++ b/pkgs/development/python-modules/pytest-randomly/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, factory_boy, faker, numpy +, pytest, pytest_xdist +}: + +buildPythonPackage rec { + pname = "pytest-randomly"; + version = "3.4.1"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0s9cx692cdchfrjqx7fgf9wnm3fdac211a4hjq1cx9qqnbpdpl2z"; + }; + + propagatedBuildInputs = [ numpy factory_boy faker ]; + + checkInputs = [ pytest pytest_xdist ]; + + # test warnings are fixed on an unreleased version: + # https://github.com/pytest-dev/pytest-randomly/pull/281 + checkPhase = "pytest -p no:randomly"; + + meta = with lib; { + description = "Pytest plugin to randomly order tests and control random.seed"; + homepage = "https://github.com/pytest-dev/pytest-randomly"; + license = licenses.bsd3; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix new file mode 100644 index 00000000000..b1b662e95b3 --- /dev/null +++ b/pkgs/development/python-modules/pytorch/bin.nix @@ -0,0 +1,68 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, isPy37 +, isPy38 +, python +, nvidia_x11 +, addOpenGLRunpath +, future +, numpy +, patchelf +, pyyaml +, requests +}: + +let + pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; + platform = if stdenv.isDarwin then "darwin" else "linux"; + srcs = import ./binary-hashes.nix; + unsupported = throw "Unsupported system"; +in buildPythonPackage { + pname = "pytorch"; + # Don't forget to update pytorch to the same version. + version = "1.6.0"; + + format = "wheel"; + + disabled = !(isPy37 || isPy38); + + src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; + + nativeBuildInputs = [ + addOpenGLRunpath + patchelf + ]; + + propagatedBuildInputs = [ + future + numpy + pyyaml + requests + ]; + + postInstall = '' + # ONNX conversion + rm -rf $out/bin + ''; + + postFixup = let + rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib nvidia_x11 ]; + in '' + find $out/${python.sitePackages}/torch/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do + echo "setting rpath for $lib..." + patchelf --set-rpath "${rpath}:$out/${python.sitePackages}/torch/lib" "$lib" + addOpenGLRunpath "$lib" + done + ''; + + pythonImportsCheck = [ "torch" ]; + + meta = with stdenv.lib; { + description = "Open source, prototype-to-production deep learning platform"; + homepage = "https://pytorch.org/"; + license = licenses.unfree; # Includes CUDA and Intel MKL. + platforms = platforms.linux; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/development/python-modules/pytorch/binary-hashes.nix b/pkgs/development/python-modules/pytorch/binary-hashes.nix new file mode 100644 index 00000000000..481dc6825c7 --- /dev/null +++ b/pkgs/development/python-modules/pytorch/binary-hashes.nix @@ -0,0 +1,10 @@ +{ + x86_64-linux-37 = { + url = "https://download.pytorch.org/whl/cu102/torch-1.6.0-cp37-cp37m-linux_x86_64.whl"; + sha256 = "0xhwv68j8gvahfzcp43bqp2x71iwv6zjhkw2f1hb82xps40mrml7"; + }; + x86_64-linux-38 = { + url = "https://download.pytorch.org/whl/cu102/torch-1.6.0-cp38-cp38-linux_x86_64.whl"; + sha256 = "05m2l04wqzw5xvjam6zwvlmc3979cksl3hrdqc2aikrv4hz8fmsk"; + }; +} diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index a767a913abb..9bdead706d7 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -104,8 +104,10 @@ let "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH "; in buildPythonPackage rec { - version = "1.6.0"; pname = "pytorch"; + # Don't forget to update pytorch-bin to the same version. + version = "1.6.0"; + disabled = !isPy3k; outputs = [ diff --git a/pkgs/development/python-modules/samsungctl/default.nix b/pkgs/development/python-modules/samsungctl/default.nix new file mode 100644 index 00000000000..d29e89db846 --- /dev/null +++ b/pkgs/development/python-modules/samsungctl/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi +, websocket_client +}: + +buildPythonPackage rec { + pname = "samsungctl"; + version = "0.7.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ipz3fd65rqkxlb02sql0awc3vnslrwb2pfrsnpfnf8bfgxpbh9g"; + }; + + propagatedBuildInputs = [ + websocket_client + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "samsungctl" ]; + + meta = with lib; { + description = "Remote control Samsung televisions via a TCP/IP connection"; + homepage = "https://github.com/Ape/samsungctl"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix new file mode 100644 index 00000000000..b41935c5825 --- /dev/null +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, requests +, websocket_client +}: + +buildPythonPackage rec { + pname = "samsungtvws"; + version = "1.5.3"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "054rr8hiacdjfxqssnxnd3xp9hh8350zjzzjvh1199bpps4l1l6n"; + }; + + patchPhase = '' + substituteInPlace setup.py --replace "websocket-client==" "websocket-client>=" + ''; + + propagatedBuildInputs = [ + websocket_client + requests + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "samsungtvws" ]; + + meta = with lib; { + description = "Samsung Smart TV WS API wrapper"; + homepage = "https://github.com/xchwarze/samsung-tv-ws-api"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index 1ff38f0a6df..fde5733a864 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "splinter"; - version = "0.13.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "9e92535f273622507ac157612c3bb0e9cee7b5ccd2aa097d47b408e34c2ca356"; + sha256 = "459e39e7a9f7572db6f1cdb5fdc5ccfc6404f021dccb969ee6287be2386a40db"; }; propagatedBuildInputs = [ selenium ]; diff --git a/pkgs/development/python-modules/ufonormalizer/default.nix b/pkgs/development/python-modules/ufonormalizer/default.nix new file mode 100644 index 00000000000..70c9061d366 --- /dev/null +++ b/pkgs/development/python-modules/ufonormalizer/default.nix @@ -0,0 +1,19 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "ufonormalizer"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0nv80x7l7sya5wzyfk9ss93r6bjzjljpkw4k8gibxp1rqrzkdms4"; + extension = "zip"; + }; + + meta = with lib; { + description = "Script to normalize the XML and other data inside of a UFO"; + homepage = "https://github.com/unified-font-object/ufoNormalizer"; + license = licenses.bsd3; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/ufoprocessor/default.nix b/pkgs/development/python-modules/ufoprocessor/default.nix new file mode 100644 index 00000000000..db5b1400fe4 --- /dev/null +++ b/pkgs/development/python-modules/ufoprocessor/default.nix @@ -0,0 +1,35 @@ +{ lib, buildPythonPackage, fetchPypi +, defcon, fonttools, lxml, fs +, mutatormath, fontmath, fontparts +, setuptools_scm +}: + +buildPythonPackage rec { + pname = "ufoProcessor"; + version = "1.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ns11aamgavgsfj8qf5kq7dvzmgl0mhr1cbych2f075ipfdvva5s"; + extension = "zip"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ + defcon + lxml + fonttools + fs + fontmath + fontparts + mutatormath + ]; + + meta = with lib; { + description = "Read, write and generate UFOs with designspace data"; + homepage = "https://github.com/LettError/ufoProcessor"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/unicodedata2/default.nix b/pkgs/development/python-modules/unicodedata2/default.nix new file mode 100644 index 00000000000..e36f0f7b03c --- /dev/null +++ b/pkgs/development/python-modules/unicodedata2/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytest }: + +buildPythonPackage rec { + pname = "unicodedata2"; + version = "13.0.0-2"; + + src = fetchFromGitHub { + owner = "mikekap"; + repo = pname; + rev = version; + sha256 = "0p9brbiwyg98q52y0gfyps52xv57fwqfpq0mn18p1xc1imip3h2b"; + }; + + checkInputs = [ pytest ]; + checkPhase = "pytest tests"; + + meta = with lib; { + description = ""; + homepage = "http://github.com/mikekap/unicodedata2"; + license = licenses.asl20; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix new file mode 100644 index 00000000000..58b7d43f3d2 --- /dev/null +++ b/pkgs/development/python-modules/zopfli/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "zopfli"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0smaxh7iihjr9mwxw1ifc9vnlh3ra8l060dd1gbvp1963k0r68pd"; + extension = "zip"; + }; + + checkInputs = [ pytest ]; + + meta = with lib; { + description = "cPython bindings for zopfli"; + homepage = "https://github.com/obp/py-zopfli"; + license = licenses.asl20; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/tools/dot-http/default.nix b/pkgs/development/tools/dot-http/default.nix new file mode 100644 index 00000000000..1c81a4145d2 --- /dev/null +++ b/pkgs/development/tools/dot-http/default.nix @@ -0,0 +1,28 @@ +{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "dot-http"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "bayne"; + repo = pname; + rev = "v${version}"; + sha256 = "1s2q4kdldhb5gd14g2h6vzrbjgbbbs9zp2dgmna0rhk1h4qv0mml"; + }; + + cargoSha256 = "0an3hskq1k2j4gdn8wvhfb9pqsc34ibs5bv7sjznkp5jma6fdr9w"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv Security + ]; + + meta = with stdenv.lib; { + description = "Text-based scriptable HTTP client"; + homepage = "https://github.com/bayne/dot-http"; + license = licenses.asl20; + maintainers = with maintainers; [ mredaelli ]; + }; +} diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index ab90cbea83d..6cf97277bb5 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.0.3"; + version = "2.0.4"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "1pwgsasja30xbm1ma0kp4nami2nwyy6aizam8nfl6jd7jkz4d7mk"; + sha256 = "1ic6gjsw90j7pr1yyplmk1zc319ld49i6d4zlgs7mlz1m4bn5jv3"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index c1c915cb8e4..3864337badf 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.10"; + version = "0.2.13"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "0xmrb8wbxkb52l2c7fxxy5wa9lsl591fl65zicv0nrbil36q4wfd"; + sha256 = "112vmq9wg31alw9lw1jmsdvkd7kz1d9ak4p9dli7vgr9rhdf0hnb"; }; - vendorSha256 = "0qf26g0a2j1mbzlc7xjackww22w9bl1x0iw3q1x6kq7fp8xiwhdn"; + vendorSha256 = "0bcrw3hf92m7n58lrlm0vj1wiwwy82q2rl1a725q3d6xwvi5kh9h"; doCheck = false; diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix index 9fdaca52ca8..52cc1b2d5c5 100644 --- a/pkgs/development/tools/misc/objconv/default.nix +++ b/pkgs/development/tools/misc/objconv/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "objconv"; - version = "2.51"; + version = "2.52"; src = fetchurl { # Versioned archive of objconv sources maintained by orivej. url = "https://archive.org/download/objconv/${pname}-${version}.zip"; - sha256 = "0wp6ld9vk11f4nnkn56627zmlv9k5vafi99qa3yyn1pgcd61zcfs"; + sha256 = "0r117r7yvqvvdgwgwxpkyzi6p5nm0xb6p67wvkmvggm9fdyl3z8v"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/tools/misc/swig/4.nix b/pkgs/development/tools/misc/swig/4.nix index a35a9a35281..4096b7353fa 100644 --- a/pkgs/development/tools/misc/swig/4.nix +++ b/pkgs/development/tools/misc/swig/4.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "swig"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "swig"; repo = "swig"; rev = "rel-${version}"; - sha256 = "1i1gl5gd6b5i1hiazq7m4nvlq86zd0fhk052xhwlnb596pjhgyhf"; + sha256 = "12vlps766xvwck8q0i280s8yx21qm2dxl34710ybpmz3c1cfdjsc"; }; PCRE_CONFIG = "${pcre.dev}/bin/pcre-config"; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index dfcc2f1a747..909e821a6d1 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "104jw2jcshzds74d7m4yqn6mbk7lgps6qnqmp6h395b1mdyjhink"; + sha256 = "0kr9whv3s0f8866yjmwg311j3kcj29bp5xwpnv43ama4m1mq3bm7"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index dbe64fc7ec1..a1e9f7971f4 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -4,11 +4,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.32.3"; + version = "0.32.4"; src = fetchCrate { inherit pname version; - sha256 = "0qcwhmba83rrwqnlkcmvnmbj9jb2bwm0mka8rcp26y4yxmjm431n"; + sha256 = "04x363wz82f0sr4128f1nk1wxnnszxsmaxjs92mbvmpbvry82ivq"; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoSha256 = "1dmcdzdm7kzmrq2xsiaikns2xzjpdmh9w8pw653nlqfjjr2h6pxp"; + cargoSha256 = "1fgcxgm800sr0y6ab7c42l335b6c00cx0f2r5rgayi645a47a1zf"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/so/default.nix b/pkgs/development/tools/so/default.nix new file mode 100644 index 00000000000..0ee2359c841 --- /dev/null +++ b/pkgs/development/tools/so/default.nix @@ -0,0 +1,27 @@ +{ stdenv, rustPlatform, fetchFromGitHub, openssl, pkg-config, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "so"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "samtay"; + repo = pname; + rev = "v${version}"; + sha256 = "09zswxxli9f5ayjwmvqhkp1yv2s4f435dcfp4cyia1zddbrh2zck"; + }; + + cargoSha256 = "1ddbhy1plag4ckbmlyj47wnky7vgmfa68msl3hl25h1lwmzaf1aq"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv Security + ]; + + meta = with stdenv.lib; { + description = "A TUI interface to the StackExchange network"; + homepage = "https://github.com/samtay/so"; + license = licenses.mit; + maintainers = with maintainers; [ mredaelli ]; + }; +} diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix index 15d6553bbb1..38573e07514 100644 --- a/pkgs/development/tools/spring-boot-cli/default.nix +++ b/pkgs/development/tools/spring-boot-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "spring-boot-cli"; - version = "2.3.1"; + version = "2.3.2"; src = fetchzip { url = "https://repo.spring.io/release/org/springframework/boot/${pname}/${version}.RELEASE/${pname}-${version}.RELEASE-bin.zip"; - sha256 = "0ddmwcifrmw197vc49b0x8vfampj3n947r4vv4nni5vjclqqfds5"; + sha256 = "1zqfnxz57234227rp303iwis0mjkkjkpcqnj9jgw78gykjnqdmmq"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index c4a1cf73987..9657543e0c7 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -5,11 +5,11 @@ with python3Packages; buildPythonApplication rec { pname = "vcstool"; - version = "0.2.7"; + version = "0.2.9"; src = fetchPypi { inherit pname version; - sha256 = "1mq8lmb1wh55cqdj7javq7qia4217h6vf5ljc99gsjyibi7g7d3k"; + sha256 = "1lb0j120sj76swi702ah6ryn770m1y7gh69237zxpyh897pn5paa"; }; propagatedBuildInputs = [ pyyaml setuptools ]; diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix index 9b53c28c60e..7c396f69f25 100644 --- a/pkgs/development/tools/vultr/default.nix +++ b/pkgs/development/tools/vultr/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "vultr"; - version = "2.0.1"; + version = "2.0.2"; goPackagePath = "github.com/JamesClonk/vultr"; src = fetchFromGitHub { owner = "JamesClonk"; repo = "vultr"; rev = "v${version}"; - sha256 = "16wlncf0wax5jhpbfif5k16knigxy89vcby0b821klv6hlm6cc58"; + sha256 = "0br8nxi9syraarp4hzav9a3p4zxhyi45cq5dsclzxi3fga2l6mqg"; }; meta = { diff --git a/pkgs/development/tools/ydiff/default.nix b/pkgs/development/tools/ydiff/default.nix index f3ecbb451f6..510808fc412 100644 --- a/pkgs/development/tools/ydiff/default.nix +++ b/pkgs/development/tools/ydiff/default.nix @@ -5,11 +5,11 @@ with pythonPackages; buildPythonApplication rec { pname = "ydiff"; - version = "1.1"; + version = "1.2"; src = fetchPypi { inherit pname version; - sha256 = "0mxcl17sx1d4vaw22ammnnn3y19mm7r6ljbarcjzi519klz26bnf"; + sha256 = "f5430577ecd30974d766ee9b8333e06dc76a947b4aae36d39612a0787865a121"; }; patchPhase = '' diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 3a0583628f0..9430ebd2ef1 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "1j5ajasng380p5a7nkk9ag5zp9ybwfz7b2z42lyk1wfg0pcd6j0r"; + sha256 = "0vdz3irhc2pxn5zh0c6frbz7pb8vr06kldxa204xwyl7fl770w3g"; fetchSubmodules = true; }; - cargoSha256 = "0ba7afk4n7k170cqwy0gjc53vz6bjc176s9w1wln6yfhh55fyw6x"; + cargoSha256 = "1ch7vxnhs69paykrglim0ixaw73lzlmrglqhjp8f4xafvdk7n2ks"; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/deps.nix b/pkgs/development/web/deno/deps.nix index 2fd88235a8e..f6baca6fb01 100644 --- a/pkgs/development/web/deno/deps.nix +++ b/pkgs/development/web/deno/deps.nix @@ -2,11 +2,11 @@ {}: rec { rustyV8Lib = { - version = "0.8.1"; + version = "0.9.1"; sha256s = { - x86_64-linux = "0nwssdbwscwkh2w9zhlvaj562z19g5icg2yi00fyw8glws69cd6p"; - aarch64-linux = "0mwd4ix511dzxpah1p2c47a1qhvff0d3kyilc3yra99fa1s0gyxy"; - x86_64-darwin = "04s4x0n85rxnncy4jsl1ak3rdgb4a3lhqg8h53mvvjmsazsj1q70"; + x86_64-linux = "07zph4x3k659ywld27b60as7j06bdbab2ws1pf67iwg7w6h7iash"; + aarch64-linux = "0w9mbsdpkrla3ayaswpdjhiqs74h23qi2sv9355h138pw431ymnx"; + x86_64-darwin = "091kzdg431lvkvcy0401di3if53pii0isk5ipfpsvic82kr7vaqk"; }; }; } diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index 4f7d1cb3750..91b841f6c51 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -4,24 +4,27 @@ stdenv.mkDerivation rec { pname = "gemrb"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { - owner = "gemrb"; - repo = "gemrb"; - rev = "v${version}"; - sha256 = "0vsr3fsqmv9b7s5l0cwhpq2pf7ah2wvgmcn9y8asj6w8hprp17d4"; + owner = "gemrb"; + repo = "gemrb"; + rev = "v${version}"; + sha256 = "14j9mhrbi4gnrbv25nlsvcxzkylijzrnwbqqnrg7pr452lb3srpb"; }; - # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl reqs) optional + # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl + # reqs) optional buildInputs = [ freetype python openal SDL2 SDL2_mixer zlib libpng libvorbis libiconv ]; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - + # TODO: add proper OpenGL support. We are currently (0.8.7) getting a shader + # error on execution when enabled. cmakeFlags = [ "-DLAYOUT=opt" + # "-DOPENGL_BACKEND=GLES" + # "-DOpenGL_GL_PREFERENCE=GLVND" ]; meta = with stdenv.lib; { diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 55848d91fab..413d98d26ac 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "VASSAL-3.2.17"; + name = "VASSAL-3.3.2"; src = fetchurl { url = "mirror://sourceforge/vassalengine/${name}-linux.tar.bz2"; - sha256 = "0nxskr46janxnb31c03zv61kr46vy98l7cwxha3vll81l4ij1sjb"; + sha256 = "1abhlkl27gyfa1lghvv76xa6ks5hiwv2s9wb9ddadm0m07f87n1w"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 7546c7626ed..21a89e5f5f2 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "7.0.7"; + version = "7.0.8"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "0vgzb923x2q2w1zgbc56d50a5qj9xm77lg7czfzg3va7vd921gy8"; + sha256 = "0q0zylv8hkhnfw0084bj1wmqwqvpflmdy1njxvvkjsbnflh8kc2y"; }; nativeBuildInputs = [ diff --git a/pkgs/misc/vscode-extensions/updateSettings.nix b/pkgs/misc/vscode-extensions/updateSettings.nix index a033229c589..c7fecf08072 100644 --- a/pkgs/misc/vscode-extensions/updateSettings.nix +++ b/pkgs/misc/vscode-extensions/updateSettings.nix @@ -16,7 +16,7 @@ let updateVSCodeSettingsCmd = '' ( - echo 'updateSettings.nix: Updating ${vscodeSettingsFile}...' + echo 'updateSettings.nix: Updating ${vscodeSettingsFile}...' oldSettings=$(cat ${vscodeSettingsFile}) echo $oldSettings' ${builtins.toJSON settings}' | ${jq}/bin/jq -s add > ${vscodeSettingsFile} )''; @@ -25,10 +25,10 @@ let fileName = builtins.baseNameOf vscodeSettingsFile; symlinkFromUserSettingCmd = lib.optionalString symlinkFromUserSetting '' && mkdir -p "${userSettingsFolder}" && ln -sfv "$(pwd)/${vscodeSettingsFile}" "${userSettingsFolder}/" ''; -in +in writeShellScriptBin ''vscodeNixUpdate-${lib.removeSuffix ".json" (fileName)}'' - (lib.optionalString (settings != {}) + (lib.optionalString (settings != {}) (if createIfDoesNotExists then '' [ ! -f "${vscodeSettingsFile}" ] && ${createEmptySettingsCmd} ${updateVSCodeSettingsCmd} ${symlinkFromUserSettingCmd} diff --git a/pkgs/misc/vscode-extensions/vscodeEnv.nix b/pkgs/misc/vscode-extensions/vscodeEnv.nix index 6e4bb7b3ea8..7c58a4bdfb3 100644 --- a/pkgs/misc/vscode-extensions/vscodeEnv.nix +++ b/pkgs/misc/vscode-extensions/vscodeEnv.nix @@ -21,13 +21,13 @@ , user-data-dir ? ''"''${TMP}''${name}"/vscode-data-dir'' # if file exists will use it and import the extensions in it into this dervation else will use empty extensions list # this file will be created/updated by vscodeExts2nix when vscode exists -, mutableExtensionsFile +, mutableExtensionsFile }: -let +let mutableExtensionsFilePath = toString mutableExtensionsFile; - mutableExtensions = if builtins.pathExists mutableExtensionsFile + mutableExtensions = if builtins.pathExists mutableExtensionsFile then import mutableExtensionsFilePath else []; - vscodeWithConfiguration = import ./vscodeWithConfiguration.nix { + vscodeWithConfiguration = import ./vscodeWithConfiguration.nix { inherit lib writeShellScriptBin extensionsFromVscodeMarketplace; vscodeDefault = vscode; } @@ -63,19 +63,19 @@ let symlinkFromUserSetting = (user-data-dir != ""); }; - vscodeExts2nix = import ./vscodeExts2nix.nix { + vscodeExts2nix = import ./vscodeExts2nix.nix { inherit lib writeShellScriptBin; vscodeDefault = vscodeWithConfiguration; } { extensionsToIgnore = nixExtensions; - extensions = mutableExtensions; + extensions = mutableExtensions; }; code = writeShellScriptBin "code" '' ${updateSettingsCmd}/bin/vscodeNixUpdate-settings ${updateLaunchCmd}/bin/vscodeNixUpdate-launch ${updateKeybindingsCmd}/bin/vscodeNixUpdate-keybindings - ${vscodeWithConfiguration}/bin/code --wait "$@" + ${vscodeWithConfiguration}/bin/code --wait "$@" echo 'running vscodeExts2nix to update ${mutableExtensionsFilePath}...' ${vscodeExts2nix}/bin/vscodeExts2nix > ${mutableExtensionsFilePath} ''; diff --git a/pkgs/misc/vscode-extensions/vscodeEnvTest.nix b/pkgs/misc/vscode-extensions/vscodeEnvTest.nix index d7e586cab6e..19a9edbf1af 100644 --- a/pkgs/misc/vscode-extensions/vscodeEnvTest.nix +++ b/pkgs/misc/vscode-extensions/vscodeEnvTest.nix @@ -1,5 +1,5 @@ with import {}; -callPackage (import ./vscodeEnv.nix) { +callPackage (import ./vscodeEnv.nix) { extensionsFromVscodeMarketplace = vscode-utils.extensionsFromVscodeMarketplace; vscodeDefault = vscode; } { @@ -9,4 +9,3 @@ callPackage (import ./vscodeEnv.nix) { t = "test"; }; } - diff --git a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix b/pkgs/misc/vscode-extensions/vscodeExts2nix.nix index afd176b4c5e..58ad5866c93 100644 --- a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix +++ b/pkgs/misc/vscode-extensions/vscodeExts2nix.nix @@ -1,24 +1,24 @@ -# based on the passed vscode will stdout a nix expression with the installed vscode extensions +# based on the passed vscode will stdout a nix expression with the installed vscode extensions { lib , vscodeDefault , writeShellScriptBin }: ##User input -{ vscode ? vscodeDefault +{ vscode ? vscodeDefault , extensionsToIgnore ? [] # will use those extensions to get sha256 if still exists when executed. -, extensions ? [] +, extensions ? [] }: -let +let mktplcExtRefToFetchArgs = import ./mktplcExtRefToFetchArgs.nix; in writeShellScriptBin "vscodeExts2nix" '' - echo '[' + echo '[' for line in $(${vscode}/bin/code --list-extensions --show-versions \ ${lib.optionalString (extensionsToIgnore != []) '' - | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : ''${e.publisher}.${e.name}'') extensionsToIgnore}\)' + | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : ''${e.publisher}.${e.name}'') extensionsToIgnore}\)' ''} ) ; do [[ $line =~ ([^.]*)\.([^@]*)@(.*) ]] diff --git a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix b/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix index f15d14c7441..e20c631f8c0 100644 --- a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix +++ b/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix @@ -1,22 +1,22 @@ # wrapper over vscode to control extensions per project (extensions folder will be created in execution path) -{ lib -, writeShellScriptBin -, extensionsFromVscodeMarketplace +{ lib +, writeShellScriptBin +, extensionsFromVscodeMarketplace , vscodeDefault }: ## User input -{ vscode ? vscodeDefault +{ vscode ? vscodeDefault # extensions to be symlinked into the project's extensions folder -, nixExtensions ? [] +, nixExtensions ? [] # extensions to be copied into the project's extensions folder -, mutableExtensions ? [] -, vscodeExtsFolderName ? ".vscode-exts" +, mutableExtensions ? [] +, vscodeExtsFolderName ? ".vscode-exts" , user-data-dir ? ''"''${TMP}vscodeWithConfiguration/vscode-data-dir"'' }: -let +let nixExtsDrvs = extensionsFromVscodeMarketplace nixExtensions; mutExtsDrvs = extensionsFromVscodeMarketplace mutableExtensions; - mutableExtsPaths = lib.forEach mutExtsDrvs ( e: + mutableExtsPaths = lib.forEach mutExtsDrvs ( e: { origin = ''${e}/share/vscode/extensions/${e.vscodeExtUniqueId}''; target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${(lib.findSingle (ext: ''${ext.publisher}.${ext.name}'' == e.vscodeExtUniqueId) "" "m" mutableExtensions ).version}''; @@ -39,16 +39,16 @@ let cp -a ${ePath.origin} ${ePath.target} chmod -R u+rwx ${ePath.target} fi - '') mutableExtsPaths} + '') mutableExtsPaths} ''; in writeShellScriptBin "code" '' - if ! [[ "$@" =~ "--list-extension" ]]; then - mkdir -p "${vscodeExtsFolderName}" + if ! [[ "$@" =~ "--list-extension" ]]; then + mkdir -p "${vscodeExtsFolderName}" ${rmExtensions} ${cpExtensions} fi - ${vscode}/bin/code --extensions-dir "${vscodeExtsFolderName}" ${ + ${vscode}/bin/code --extensions-dir "${vscodeExtsFolderName}" ${ lib.optionalString (user-data-dir != "") ''--user-data-dir ${user-data-dir }'' } "$@" '' diff --git a/pkgs/os-specific/linux/deepin-anything/default.nix b/pkgs/os-specific/linux/deepin-anything/default.nix deleted file mode 100644 index 4139cc153cd..00000000000 --- a/pkgs/os-specific/linux/deepin-anything/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, deepin, kernel }: - -stdenv.mkDerivation { - pname = "deepin-anything-module"; - version = "${deepin.deepin-anything.version}-${kernel.version}"; - src = deepin.deepin-anything.modsrc; - - nativeBuildInputs = kernel.moduleBuildDependencies; - - buildPhase = '' - make -C src/deepin-anything-0.0 kdir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build - ''; - - installPhase = '' - install -m 644 -D -t $out/lib/modules/${kernel.modDirVersion}/extra src/deepin-anything-0.0/*.ko - ''; - - meta = deepin.deepin-anything.meta // { - description = deepin.deepin-anything.meta.description + " (kernel modules)"; - badPlatforms = [ "aarch64-linux" ]; # the kernel module is not building - }; -} diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 0783fb79296..66edb34d244 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -167,6 +167,11 @@ let # Needs a different set of modules than po/make-images. inherit installedTestsPython; }) + + (fetchpatch { + url = "https://github.com/fwupd/fwupd/commit/3e82beeddac31292c50229e59e2404865edee5ad.patch"; + sha256 = "17p9r8qddqkrnhy9bvp9207afh5fcl1whn79nqcp57b4q4c17zgk"; + }) ]; postPatch = '' diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index 1086e5ece04..000400e4cdf 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -34,10 +34,6 @@ buildGoModule rec { make install ''; - preFixup = '' - remove-references-to -t ${fscrypt-experimental.go} $out/lib/security/pam_fscrypt.so - ''; - meta = with stdenv.lib; { description = "A high-level tool for the management of Linux filesystem encryption"; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 824eb1a6966..060d747e763 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,22 +1,22 @@ { "4.14": { - "name": "linux-hardened-4.14.194.a.patch", - "sha256": "07z3lr3mbm6c95d7fra2qp071n1c45f9241cl19zs63g00avi11p", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.194.a/linux-hardened-4.14.194.a.patch" + "name": "linux-hardened-4.14.195.a.patch", + "sha256": "1a1g9q750gbnkcycqnzafb22f7250ck8dvzx6jqkz669wdg2pd7z", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.195.a/linux-hardened-4.14.195.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.141.a.patch", - "sha256": "0yiqkkp17pf9r6nakpnqhvmf8awpzp5n27cmh15ril7vn1y71sxw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.141.a/linux-hardened-4.19.141.a.patch" + "name": "linux-hardened-4.19.142.a.patch", + "sha256": "1gwvacr23lp8qryfhnqn89pn9ly9d8c42rirvkz5psfmvnm7vxbn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.142.a/linux-hardened-4.19.142.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.60.a.patch", - "sha256": "138kms73rlj5zmsb2ivjzz1jr5aa8y8pmwzx02c7j1qk08v82823", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.60.a/linux-hardened-5.4.60.a.patch" + "name": "linux-hardened-5.4.61.a.patch", + "sha256": "1sgysrkycca860m2h7vrnfkplbsari6blcrkbsn285s5d0fsicnc", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.61.a/linux-hardened-5.4.61.a.patch" }, "5.7": { - "name": "linux-hardened-5.7.17.a.patch", - "sha256": "181b473y0hkw076hsndw6nfynr2yhcaypj48iqnk25hzcj40nnaz", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.17.a/linux-hardened-5.7.17.a.patch" + "name": "linux-hardened-5.7.19.a.patch", + "sha256": "1lydlh499aj3ck5cnv8q2271y4klvp17zm7j7qni16am14bld936", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.19.a/linux-hardened-5.7.19.a.patch" } } diff --git a/pkgs/os-specific/linux/kernel/linux-5.7.nix b/pkgs/os-specific/linux/kernel/linux-5.7.nix index 187bb0dd6bb..4f721d8b0e4 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.7.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7.18"; + version = "5.7.19"; # 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 = "0p54icpxacrx8k09qam2hx22azh9xz9fzyif2z73qagk3syz5pd4"; + sha256 = "1rwzp51ddlkdzanj6i8jqj5yh0njpzn7ly4r8nnzwkdfp5465721"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.8.nix b/pkgs/os-specific/linux/kernel/linux-5.8.nix index 5d545f184f3..59acda122aa 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.8.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8.4"; + version = "5.8.5"; # 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 = "15hyz92wsk6fxqr1rq0k77qw76jka2igpc9xviwa0j4a5qrr43fv"; + sha256 = "0zwl0nk3x6fxwsbnmpx1drh7v0116yhgamisb1pghd472mmw6klx"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix index a1a37db9dd6..135187c9a10 100644 --- a/pkgs/os-specific/linux/microcode/amd.nix +++ b/pkgs/os-specific/linux/microcode/amd.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "AMD Processor microcode patch"; - homepage = "http://www.amd64.org/support/microcode.html"; + homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index d62ade04e63..63091e9875f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -19,6 +19,9 @@ # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. libsOnly ? false +, # don't include the bundled 32-bit libraries on 64-bit platforms, + # even if it’s in downloaded binary + disable32Bit ? false }: with stdenv.lib; @@ -30,7 +33,7 @@ assert ! versionOlder version "391" -> stdenv.hostPlatform.system == "x86_64-lin let nameSuffix = optionalString (!libsOnly) "-${kernel.version}"; pkgSuffix = optionalString (versionOlder version "304") "-pkg0"; - i686bundled = versionAtLeast version "391"; + i686bundled = versionAtLeast version "391" && !disable32Bit; libPathFor = pkgs: pkgs.lib.makeLibraryPath [ pkgs.libdrm pkgs.xorg.libXext pkgs.xorg.libX11 pkgs.xorg.libXv pkgs.xorg.libXrandr pkgs.xorg.libxcb pkgs.zlib pkgs.stdenv.cc.cc ]; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 56b36d4f368..27e26b13a53 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -42,25 +42,27 @@ let inherit rev sha256; }; - patches = [ ./BACKPORT-Linux-5.8-compat-__vmalloc.patch ] ++ extraPatches; + patches = extraPatches; postPatch = optionalString buildKernel '' patchShebangs scripts # The arrays must remain the same length, so we repeat a flag that is # already part of the command and therefore has no effect. - substituteInPlace ./module/zfs/zfs_ctldir.c --replace '"/usr/bin/env", "umount"' '"${utillinux}/bin/umount", "-n"' \ - --replace '"/usr/bin/env", "mount"' '"${utillinux}/bin/mount", "-n"' + substituteInPlace ./module/${optionalString isUnstable "os/linux/"}zfs/zfs_ctldir.c \ + --replace '"/usr/bin/env", "umount"' '"${utillinux}/bin/umount", "-n"' \ + --replace '"/usr/bin/env", "mount"' '"${utillinux}/bin/mount", "-n"' '' + optionalString buildUser '' substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" \ --replace "/bin/mount" "${utillinux}/bin/mount" - substituteInPlace ./lib/libshare/nfs.c --replace "/usr/sbin/exportfs" "${ + substituteInPlace ./lib/libshare/${optionalString isUnstable "os/linux/"}nfs.c --replace "/usr/sbin/exportfs" "${ # We don't *need* python support, but we set it like this to minimize closure size: # If it's disabled by default, no need to enable it, even if we have python enabled # And if it's enabled by default, only change that if we explicitly disable python to remove python from the closure nfs-utils.override (old: { enablePython = old.enablePython or true && enablePython; }) }/bin/exportfs" substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" - substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" + substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" \ + --replace "/etc/default" "$out/etc/default" substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc" substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" @@ -79,6 +81,13 @@ let substituteInPlace ./etc/systemd/system/Makefile.am \ --replace '$(DESTDIR)$(systemdunitdir)' "$out"'$(DESTDIR)$(systemdunitdir)' + ${optionalString isUnstable '' + substituteInPlace ./contrib/initramfs/conf.d/Makefile.am \ + --replace "/usr/share/initramfs-tools/conf.d" "$out/usr/share/initramfs-tools/conf.d" + substituteInPlace ./contrib/initramfs/conf-hooks.d/Makefile.am \ + --replace "/usr/share/initramfs-tools/conf-hooks.d" "$out/usr/share/initramfs-tools/conf-hooks.d" + ''} + substituteInPlace ./etc/systemd/system/zfs-share.service.in \ --replace "/bin/rm " "${coreutils}/bin/rm " @@ -190,6 +199,7 @@ in { version = "0.8.4"; sha256 = "1hl4n900d24gl4vd65qdzq4m62b7bpvckldazcbd1xqcn8xhi6wp"; + extraPatches = [ ./BACKPORT-Linux-5.8-compat-__vmalloc.patch ]; }; zfsUnstable = common { @@ -197,9 +207,9 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "0.8.4"; + version = "2.0.0-rc1"; - sha256 = "1hl4n900d24gl4vd65qdzq4m62b7bpvckldazcbd1xqcn8xhi6wp"; + sha256 = "0d1m5zwgqzfwbscvb60zvzkjgl5nkbvas22vjsyci3xygz0qwjsb"; isUnstable = true; }; } diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 6a602883b35..d546b07148b 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -5,14 +5,13 @@ 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.5"; + version = "2.9.6"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "1109a8ba212ff8ddfdbaf44a6f8fc13a2b880a98a9e54c19112ba72a1aacbf76"; + sha256 = "bf742883c6825b54f19f2dadca2c94fec1ff8bdcf0a52388e2e167937594b2e7"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix new file mode 100644 index 00000000000..343b3d2b19d --- /dev/null +++ b/pkgs/servers/gonic/default.nix @@ -0,0 +1,59 @@ +{ lib, buildGoPackage, fetchFromGitHub +, pkg-config, taglib, alsaLib + +# Disable on-the-fly transcoding, +# removing the dependency on ffmpeg. +# The server will (as of 0.11.0) gracefully fall back +# to the original file, but if transcoding is configured +# that takes a while. So best to disable all transcoding +# in the configuration if you disable transcodingSupport. +, transcodingSupport ? true, ffmpeg + +# udpater +, writers, vgo2nix }: + +assert transcodingSupport -> ffmpeg != null; + +let + # update these, then run `updateScript` to update dependencies + version = "0.11.0"; + rev = "056fb54a703ef5b5194ce112cbbdd8fb53dbb1ea"; + sha256 = "0hd794wrz29nh89lfnq67w1rc23sg085rqf1agwlgpqycns2djl9"; + + src = fetchFromGitHub { + owner = "sentriz"; + repo = "gonic"; + inherit rev sha256; + }; + +in +buildGoPackage { + pname = "gonic-${version}"; + inherit version src; + goPackagePath = "go.senan.xyz/gonic"; + goDeps = ./deps.nix; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ taglib alsaLib ]; + + postPatch = lib.optionalString transcodingSupport '' + substituteInPlace \ + server/encode/encode.go \ + --replace \ + 'ffmpegPath = "/usr/bin/ffmpeg"' \ + 'ffmpegPath = "${ffmpeg}/bin/ffmpeg"' \ + ''; + + passthru.updateScript = writers.writeDash "update-gonic" '' + ${vgo2nix}/bin/vgo2nix \ + -dir ${src} \ + -outfile ${lib.escapeShellArg (toString ./deps.nix)} + ''; + + meta = { + homepage = "https://github.com/sentriz/gonic"; + description = "Music streaming server / subsonic server API implementation"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ Profpatsch ]; + }; +} diff --git a/pkgs/servers/gonic/deps.nix b/pkgs/servers/gonic/deps.nix new file mode 100644 index 00000000000..71b2f83a0e0 --- /dev/null +++ b/pkgs/servers/gonic/deps.nix @@ -0,0 +1,795 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-cloud-go"; + rev = "v0.33.1"; + sha256 = "1xs487sqajpvnhlwp130sfaajyinhxxq2yvmv2533mwf0zhcpz6v"; + }; + } + { + goPackagePath = "dmitri.shuralyov.com/gpu/mtl"; + fetch = { + type = "git"; + url = "https://dmitri.shuralyov.com/gpu/mtl"; + rev = "666a987793e9"; + sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/BurntSushi/xgb"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/xgb"; + rev = "27f122750802"; + sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj"; + }; + } + { + 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.5.0"; + sha256 = "1i169xscsxsh8lsw8bz2apnsqixld37xdnfh36i30xy5wnf0iwfx"; + }; + } + { + goPackagePath = "github.com/Masterminds/sprig"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/sprig"; + rev = "v2.22.0"; + sha256 = "09dzwhj4zh3p6f1jhyic16n4qdnvpamz7hyk9fycpm4b1jfq63gd"; + }; + } + { + goPackagePath = "github.com/OneOfOne/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/OneOfOne/xxhash"; + rev = "v1.2.2"; + sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6"; + }; + } + { + goPackagePath = "github.com/cespare/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/cespare/xxhash"; + rev = "v1.1.0"; + sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x"; + }; + } + { + goPackagePath = "github.com/d4l3k/messagediff"; + fetch = { + type = "git"; + url = "https://github.com/d4l3k/messagediff"; + rev = "7e0a312ae40b"; + sha256 = "1ab2gm7ys33rs84fjzqcb7b4jy2rr1a0w5a9kakfaf80wd0rjrah"; + }; + } + { + 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/denisenkom/go-mssqldb"; + fetch = { + type = "git"; + url = "https://github.com/denisenkom/go-mssqldb"; + rev = "732737034ffd"; + sha256 = "0k1inn33lbfj97d5ir3k5gffjcpb39kairq91jfrz6pnbq0w3zlf"; + }; + } + { + goPackagePath = "github.com/disintegration/imaging"; + fetch = { + type = "git"; + url = "https://github.com/disintegration/imaging"; + rev = "v1.6.2"; + sha256 = "1sl201nmk601h0aii4234sycn4v2b0rjxf8yhrnik4yjzd68q9x5"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } + { + goPackagePath = "github.com/erikstmartin/go-testdb"; + fetch = { + type = "git"; + url = "https://github.com/erikstmartin/go-testdb"; + rev = "8d10e4a1bae5"; + sha256 = "1fhrqcpv8x74qwxx9gpnhgqbz5wkp2bnsq92w418l1fnrgh4ppmq"; + }; + } + { + goPackagePath = "github.com/faiface/beep"; + fetch = { + type = "git"; + url = "https://github.com/faiface/beep"; + rev = "v1.0.2"; + sha256 = "07j0k0ynw1q8f7fzsan4kvfmdlda11583sck66hxfsk9zbp8vpxv"; + }; + } + { + goPackagePath = "github.com/gdamore/encoding"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/encoding"; + rev = "v1.0.0"; + sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9"; + }; + } + { + goPackagePath = "github.com/gdamore/tcell"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/tcell"; + rev = "v1.1.1"; + sha256 = "0il2nnxp2cqiy73m49215dnf9in3vd25ji8qxbmq87c5qy7i1q9d"; + }; + } + { + goPackagePath = "github.com/go-audio/audio"; + fetch = { + type = "git"; + url = "https://github.com/go-audio/audio"; + rev = "v1.0.0"; + sha256 = "05ai13yc8wwk2zlk9br62lh4z9hs1q685l7ij618bknf449vjsf3"; + }; + } + { + goPackagePath = "github.com/go-audio/riff"; + fetch = { + type = "git"; + url = "https://github.com/go-audio/riff"; + rev = "v1.0.0"; + sha256 = "0wg3p3gsad1rql7bzx7pwwsyd00a5gdb8f1h7zfr7hlqja5skwb4"; + }; + } + { + goPackagePath = "github.com/go-audio/wav"; + fetch = { + type = "git"; + url = "https://github.com/go-audio/wav"; + rev = "v1.0.0"; + sha256 = "058mgc5ahjibnsqayk3k75l04gg9mv27bpmj79jyrya3kaczpamk"; + }; + } + { + goPackagePath = "github.com/go-gl/glfw"; + fetch = { + type = "git"; + url = "https://github.com/go-gl/glfw"; + rev = "6f7a984d4dc4"; + sha256 = "1nyv7h08qf4dp8w9pmcnrc6vv9bkwj8fil6pz0mkbss5hf4i8xcq"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "v1.5.0"; + sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v"; + }; + } + { + goPackagePath = "github.com/gofrs/uuid"; + fetch = { + type = "git"; + url = "https://github.com/gofrs/uuid"; + rev = "v3.2.0"; + sha256 = "1q63mp7bznhfgyw133c0wc0hpcj1cq9bcf7w1f8r6inkcrils1fz"; + }; + } + { + goPackagePath = "github.com/golang-sql/civil"; + fetch = { + type = "git"; + url = "https://github.com/golang-sql/civil"; + rev = "cb61b32ac6fe"; + sha256 = "0yadfbvi0w06lg3sxw0daji02jxd3vv2in26yfmwpl4vd4vm9zay"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.2.0"; + sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.1"; + sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; + }; + } + { + goPackagePath = "github.com/gopherjs/gopherjs"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/gopherjs"; + rev = "0210a2f0f73c"; + sha256 = "1n80xjfc1dkxs8h8mkpw83n89wi5n7hzc3rxhwjs76rkxpq3rc9j"; + }; + } + { + goPackagePath = "github.com/gopherjs/gopherwasm"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/gopherwasm"; + rev = "v1.0.0"; + sha256 = "0q20il68gqnrc0s8jndc8mw1ynln60a4xy1lrqakzmp8whyilwri"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "v1.1.1"; + sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "v1.7.4"; + sha256 = "1d0sy1paa055ic84sp3766s9pa24q008hf77dc842vrgvn8p3wmh"; + }; + } + { + goPackagePath = "github.com/gorilla/securecookie"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/securecookie"; + rev = "v1.1.1"; + sha256 = "16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410"; + }; + } + { + goPackagePath = "github.com/gorilla/sessions"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/sessions"; + rev = "v1.2.0"; + sha256 = "1kz6ydgp7vamhl2ak02hvzp2yv1dbfbwzsdxn6271lyzzdvz4pp1"; + }; + } + { + goPackagePath = "github.com/hajimehoshi/go-mp3"; + fetch = { + type = "git"; + url = "https://github.com/hajimehoshi/go-mp3"; + rev = "v0.2.1"; + sha256 = "0dxqpyj4xbq570if25g5wqbbp6frhq733h2ny3b2z3z8hw4q7vgg"; + }; + } + { + goPackagePath = "github.com/hajimehoshi/oto"; + fetch = { + type = "git"; + url = "https://github.com/hajimehoshi/oto"; + rev = "v0.6.1"; + sha256 = "1k3c0y8gdxn2c8fqc8rbjrn7nbbbhii3krma267jg01qq2zpsm8h"; + }; + } + { + goPackagePath = "github.com/huandu/xstrings"; + fetch = { + type = "git"; + url = "https://github.com/huandu/xstrings"; + rev = "v1.3.1"; + sha256 = "0j5vsyjxclk7g7vfr3mfybbimywf3khr8yx07dsdcm1zjwb092iy"; + }; + } + { + goPackagePath = "github.com/icza/bitio"; + fetch = { + type = "git"; + url = "https://github.com/icza/bitio"; + rev = "v1.0.0"; + sha256 = "1c4ps4a9khx2bqp6v0p7b7l0s0gly3vj8rkh816vznj4mdlgk76w"; + }; + } + { + goPackagePath = "github.com/icza/mighty"; + fetch = { + type = "git"; + url = "https://github.com/icza/mighty"; + rev = "cfd07d671de6"; + sha256 = "09prb460wqg72s753g3a9rm0ph60hp83najj0lx9ifp1lixnfb3d"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "v0.3.9"; + sha256 = "042v7bzx575isa4pr868hrlv085qxpg8qi4m04jnkh5vbq4hvs90"; + }; + } + { + goPackagePath = "github.com/jfreymuth/oggvorbis"; + fetch = { + type = "git"; + url = "https://github.com/jfreymuth/oggvorbis"; + rev = "v1.0.0"; + sha256 = "0c0r63sp4q8bl8vvgayr98m0fsscl1f65cd2h7i4cr1awg6r6l6a"; + }; + } + { + goPackagePath = "github.com/jfreymuth/vorbis"; + fetch = { + type = "git"; + url = "https://github.com/jfreymuth/vorbis"; + rev = "v1.0.0"; + sha256 = "16gl1lwagiqw6ib48zsl4zpv1dmykz7fzhxc65vpcdipx2byhi7a"; + }; + } + { + goPackagePath = "github.com/jinzhu/gorm"; + fetch = { + type = "git"; + url = "https://github.com/jinzhu/gorm"; + rev = "v1.9.12"; + sha256 = "06d25jvrqvp1bd4k7mh9gsk414d2vhpr049qvj46yx21hyv9d6v3"; + }; + } + { + goPackagePath = "github.com/jinzhu/inflection"; + fetch = { + type = "git"; + url = "https://github.com/jinzhu/inflection"; + rev = "v1.0.0"; + sha256 = "165i20d11s03771gi43skl66salxj36212r25fbs0cgr4qgfj7fy"; + }; + } + { + goPackagePath = "github.com/jinzhu/now"; + fetch = { + type = "git"; + url = "https://github.com/jinzhu/now"; + rev = "v1.0.1"; + sha256 = "1b4gyw01b3rq3js43n0wqb1k2iymb2mnpdv7vapjs0lsbm4g5q1p"; + }; + } + { + goPackagePath = "github.com/joho/godotenv"; + fetch = { + type = "git"; + url = "https://github.com/joho/godotenv"; + rev = "v1.3.0"; + sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm"; + }; + } + { + goPackagePath = "github.com/josephburnett/jd"; + fetch = { + type = "git"; + url = "https://github.com/josephburnett/jd"; + rev = "aa1a7c66b42f"; + sha256 = "0yjdnifwxhdgzcw4jkal3f69sgcjrdiscd5wg45d83zfrsqbb34c"; + }; + } + { + goPackagePath = "github.com/karrick/godirwalk"; + fetch = { + type = "git"; + url = "https://github.com/karrick/godirwalk"; + rev = "v1.15.6"; + sha256 = "0i8202kcihz2hvqp7zzbla5p9x2ljpbjg5zy5dy3x0capz0ina3c"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "v1.3.0"; + sha256 = "0bfravwqyj7z6v4lhsibbmgp7lajdydy4ij6c81g8hv0067x2mqw"; + }; + } + { + goPackagePath = "github.com/lucasb-eyer/go-colorful"; + fetch = { + type = "git"; + url = "https://github.com/lucasb-eyer/go-colorful"; + rev = "12d3b2882a08"; + sha256 = "1w95axfn1a6rz31xrks77ingr9mdkqyr7mh0glv664kz1wg2h0gw"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "v0.0.4"; + sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "v2.0.3"; + sha256 = "0gn4dgvwmbf8gmhn5nzpwixc39g8mkp3n8lhyjgvhvsl72llcdzv"; + }; + } + { + goPackagePath = "github.com/mewkiz/flac"; + fetch = { + type = "git"; + url = "https://github.com/mewkiz/flac"; + rev = "v1.0.6"; + sha256 = "19083pfc6wxkb45s61di9a542jslcgkzif5z3qjymy085w4aizzx"; + }; + } + { + goPackagePath = "github.com/mewkiz/pkg"; + fetch = { + type = "git"; + url = "https://github.com/mewkiz/pkg"; + rev = "f6b5e26764c3"; + sha256 = "0djxw953sp2cwqybjxsfrsfma5yjn8n1l19g8yrd629cb6r1ghq2"; + }; + } + { + goPackagePath = "github.com/mitchellh/copystructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/copystructure"; + rev = "v1.0.0"; + sha256 = "05njg92w1088v4yl0js0zdrpfq6k37i9j14mxkr3p90p5yd9rrrr"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-wordwrap"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-wordwrap"; + rev = "v1.0.0"; + sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf"; + }; + } + { + goPackagePath = "github.com/mitchellh/reflectwalk"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/reflectwalk"; + rev = "v1.0.1"; + sha256 = "0pa6a3nhzwv5s5yqcmsmsfhdp5ggxsg2wa86f3akawxrhrkjarnx"; + }; + } + { + goPackagePath = "github.com/nicksellen/audiotags"; + fetch = { + type = "git"; + url = "https://github.com/nicksellen/audiotags"; + rev = "94015fa599bd"; + sha256 = "1817vw2j1lnk4y3925cszmkvwzsdcmgccrcdqyq39jqpwawl2c0j"; + }; + } + { + goPackagePath = "github.com/oklog/run"; + fetch = { + type = "git"; + url = "https://github.com/oklog/run"; + rev = "v1.1.0"; + sha256 = "0r55p3kgdkgw55i33lqvvvl60mjp92mhd1170m980sw98z9150jk"; + }; + } + { + goPackagePath = "github.com/oxtoacart/bpool"; + fetch = { + type = "git"; + url = "https://github.com/oxtoacart/bpool"; + rev = "03653db5a59c"; + sha256 = "1crdgm5w6kvcnvdglrrnrfkh5h60ldafwvrv00q97lz3790kgb15"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "v1.6.0"; + sha256 = "0l2830pi64fg0bdsyd5afkbw0p7879pppzdqqk3c7vjrjfmi5xbq"; + }; + } + { + goPackagePath = "github.com/peterbourgon/ff"; + fetch = { + type = "git"; + url = "https://github.com/peterbourgon/ff"; + rev = "v1.7.0"; + sha256 = "17msscfi4pfdih1w3sq0wsw6246a30fckga9kvjpzwva6jni0466"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.9.1"; + sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; + }; + } + { + 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/rainycape/unidecode"; + fetch = { + type = "git"; + url = "https://github.com/rainycape/unidecode"; + rev = "cb7f23ec59be"; + sha256 = "1wvzdijd640blwkgmw6h09frkfa04kcpdq87n2zh2ymj1dzla5v5"; + }; + } + { + goPackagePath = "github.com/spaolacci/murmur3"; + fetch = { + type = "git"; + url = "https://github.com/spaolacci/murmur3"; + rev = "f09979ecbc72"; + sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.0"; + sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.3.0"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; + }; + } + { + goPackagePath = "github.com/wader/gormstore"; + fetch = { + type = "git"; + url = "https://github.com/wader/gormstore"; + rev = "65a111a20c23"; + sha256 = "0dnylv4gdqsizll7b07nivv6chanqm0014yhqg6gcjccns6bl9bm"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "06a226fb4e37"; + sha256 = "0fdig6jx81g7a44dnxggibl909wchsj4nakmmhhz7db36sl0d7m5"; + }; + } + { + goPackagePath = "golang.org/x/exp"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/exp"; + rev = "00229845015e"; + sha256 = "0b0f05vbxzbgaaawxqns2m9qbvkfam1ylq8c8yhv7h6jnk2afaff"; + }; + } + { + goPackagePath = "golang.org/x/image"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/image"; + rev = "33d19683fad8"; + sha256 = "16qw6s9qlv84x98s9dib90y97x8bli3msaqw8kz498dbnbyx59zk"; + }; + } + { + goPackagePath = "golang.org/x/mobile"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mobile"; + rev = "4c31acba0007"; + sha256 = "0k42pn6fq886k9hn85wbgg4h4y1myj7niw0746sn50zfbrmy3s2c"; + }; + } + { + goPackagePath = "golang.org/x/mod"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mod"; + rev = "331c550502dd"; + sha256 = "0942gzs6mlsjal4drjmm8gr54pj1cdhsl9mnj3ygm200mf3fj6pi"; + }; + } + { + 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 = "fe76b779f299"; + sha256 = "0g6j3n9fdv1a2lp2i8wbaaya85yrbfx3ns6iq1s7l2ayhxxmgh6b"; + }; + } + { + 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 = "b753a1ba74fa"; + sha256 = "1xyzswbz9cx0bns2n75fw9pbm82dk9dj2il9iknmryyxvci9n5zv"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "1b5146add898"; + sha256 = "0w2akj91krxjag0xdhsg78470888nicc5ismc2ap9jqpss6v1zih"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.4.0"; + sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn"; + }; + } + { + goPackagePath = "gopkg.in/DATA-DOG/go-sqlmock.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/DATA-DOG/go-sqlmock.v1"; + rev = "v1.3.0"; + sha256 = "1684d6ima6638xwvr743kd7j5mpqq0vspcw9ai67bnb7m722qqqv"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "gopkg.in/gormigrate.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/gormigrate.v1"; + rev = "v1.6.0"; + sha256 = "03304vh58i5gxchrxy2v91bjdfgp7849jarmlanz3gaa2r574fmf"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.4"; + sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2"; + }; + } +] diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 922755db1fb..4a6989989ae 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,11 +2,11 @@ # Do not edit! { - version = "0.114.3"; + version = "0.114.4"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "accuweather" = ps: with ps; [ ]; # missing inputs: accuweather - "acer_projector" = ps: with ps; [ pyserial]; + "acer_projector" = ps: with ps; [ pyserial ]; "acmeda" = ps: with ps; [ ]; # missing inputs: aiopulse "actiontec" = ps: with ps; [ ]; "adguard" = ps: with ps; [ ]; # missing inputs: adguardhome @@ -15,39 +15,39 @@ "agent_dvr" = ps: with ps; [ ]; # missing inputs: agent-py "air_quality" = ps: with ps; [ ]; "airly" = ps: with ps; [ ]; # missing inputs: airly - "airvisual" = ps: with ps; [ pyairvisual]; + "airvisual" = ps: with ps; [ pyairvisual ]; "aladdin_connect" = ps: with ps; [ ]; # missing inputs: aladdin_connect "alarm_control_panel" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ ]; # missing inputs: adext "alert" = ps: with ps; [ ]; - "alexa" = ps: with ps; [ aiohttp-cors]; - "almond" = ps: with ps; [ aiohttp-cors]; # missing inputs: pyalmond + "alexa" = ps: with ps; [ aiohttp-cors ]; + "almond" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pyalmond "alpha_vantage" = ps: with ps; [ ]; # missing inputs: alpha_vantage - "amazon_polly" = ps: with ps; [ boto3]; - "ambiclimate" = ps: with ps; [ aiohttp-cors]; # missing inputs: ambiclimate + "amazon_polly" = ps: with ps; [ boto3 ]; + "ambiclimate" = ps: with ps; [ aiohttp-cors ]; # missing inputs: ambiclimate "ambient_station" = ps: with ps; [ ]; # missing inputs: aioambient - "amcrest" = ps: with ps; [ ha-ffmpeg]; # missing inputs: amcrest + "amcrest" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: amcrest "ampio" = ps: with ps; [ ]; # missing inputs: asmog "android_ip_webcam" = ps: with ps; [ ]; # missing inputs: pydroid-ipcam "androidtv" = ps: with ps; [ ]; # missing inputs: adb-shell[async] androidtv[async] pure-python-adb "anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant "anthemav" = ps: with ps; [ ]; # missing inputs: anthemav - "apache_kafka" = ps: with ps; [ aiokafka]; + "apache_kafka" = ps: with ps; [ aiokafka ]; "apcupsd" = ps: with ps; [ ]; # missing inputs: apcaccess - "api" = ps: with ps; [ aiohttp-cors]; + "api" = ps: with ps; [ aiohttp-cors ]; "apns" = ps: with ps; [ ]; # missing inputs: apns2 - "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf]; - "apprise" = ps: with ps; [ apprise]; + "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf ]; + "apprise" = ps: with ps; [ apprise ]; "aprs" = ps: with ps; [ ]; # missing inputs: aprslib geopy "aqualogic" = ps: with ps; [ ]; # missing inputs: aqualogic "aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc "arcam_fmj" = ps: with ps; [ ]; # missing inputs: arcam-fmj "arduino" = ps: with ps; [ ]; # missing inputs: PyMata "arest" = ps: with ps; [ ]; - "arlo" = ps: with ps; [ ha-ffmpeg]; # missing inputs: pyarlo + "arlo" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: pyarlo "arris_tg2492lg" = ps: with ps; [ ]; # missing inputs: arris-tg2492lg - "aruba" = ps: with ps; [ pexpect]; - "arwn" = ps: with ps; [ aiohttp-cors paho-mqtt]; + "aruba" = ps: with ps; [ pexpect ]; + "arwn" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "asterisk_cdr" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asuswrt" = ps: with ps; [ ]; # missing inputs: aioasuswrt @@ -57,17 +57,17 @@ "august" = ps: with ps; [ ]; # missing inputs: py-august "aurora" = ps: with ps; [ ]; "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy - "auth" = ps: with ps; [ aiohttp-cors]; - "automation" = ps: with ps; [ aiohttp-cors]; + "auth" = ps: with ps; [ aiohttp-cors ]; + "automation" = ps: with ps; [ aiohttp-cors ]; "avea" = ps: with ps; [ ]; # missing inputs: avea "avion" = ps: with ps; [ ]; # missing inputs: avion - "avri" = ps: with ps; [ pycountry]; # missing inputs: avri-api + "avri" = ps: with ps; [ pycountry ]; # missing inputs: avri-api "awair" = ps: with ps; [ ]; # missing inputs: python_awair "aws" = ps: with ps; [ ]; # missing inputs: aiobotocore - "axis" = ps: with ps; [ aiohttp-cors paho-mqtt]; # missing inputs: axis + "axis" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: axis "azure_devops" = ps: with ps; [ ]; # missing inputs: aioazuredevops "azure_event_hub" = ps: with ps; [ ]; # missing inputs: azure-eventhub - "azure_service_bus" = ps: with ps; [ azure-servicebus]; + "azure_service_bus" = ps: with ps; [ azure-servicebus ]; "baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip "bayesian" = ps: with ps; [ ]; "bbb_gpio" = ps: with ps; [ ]; # missing inputs: Adafruit_BBIO @@ -80,22 +80,22 @@ "blackbird" = ps: with ps; [ ]; # missing inputs: pyblackbird "blebox" = ps: with ps; [ ]; # missing inputs: blebox_uniapi "blink" = ps: with ps; [ ]; # missing inputs: blinkpy - "blinksticklight" = ps: with ps; [ BlinkStick]; + "blinksticklight" = ps: with ps; [ BlinkStick ]; "blinkt" = ps: with ps; [ ]; # missing inputs: blinkt "blockchain" = ps: with ps; [ ]; # missing inputs: python-blockchain-api "bloomsky" = ps: with ps; [ ]; - "bluesound" = ps: with ps; [ xmltodict]; + "bluesound" = ps: with ps; [ xmltodict ]; "bluetooth_le_tracker" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL] - "bluetooth_tracker" = ps: with ps; [ bt_proximity]; # missing inputs: pybluez + "bluetooth_tracker" = ps: with ps; [ bt_proximity ]; # missing inputs: pybluez "bme280" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi "bme680" = ps: with ps; [ ]; # missing inputs: bme680 smbus-cffi "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected "bom" = ps: with ps; [ ]; # missing inputs: bomradarloop "bond" = ps: with ps; [ ]; # missing inputs: bond-api - "braviatv" = ps: with ps; [ bravia-tv]; - "broadlink" = ps: with ps; [ broadlink]; - "brother" = ps: with ps; [ brother]; + "braviatv" = ps: with ps; [ bravia-tv ]; + "broadlink" = ps: with ps; [ broadlink ]; + "brother" = ps: with ps; [ brother ]; "brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan "browser" = ps: with ps; [ ]; "brunt" = ps: with ps; [ ]; # missing inputs: brunt @@ -103,15 +103,15 @@ "bt_home_hub_5" = ps: with ps; [ ]; # missing inputs: bthomehub5-devicelist "bt_smarthub" = ps: with ps; [ ]; # missing inputs: btsmarthub_devicelist "buienradar" = ps: with ps; [ ]; # missing inputs: buienradar - "caldav" = ps: with ps; [ caldav]; - "calendar" = ps: with ps; [ aiohttp-cors]; - "camera" = ps: with ps; [ aiohttp-cors]; - "canary" = ps: with ps; [ ha-ffmpeg]; # missing inputs: py-canary - "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa PyChromecast zeroconf]; + "caldav" = ps: with ps; [ caldav ]; + "calendar" = ps: with ps; [ aiohttp-cors ]; + "camera" = ps: with ps; [ aiohttp-cors ]; + "canary" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: py-canary + "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa PyChromecast zeroconf ]; "cert_expiry" = ps: with ps; [ ]; "channels" = ps: with ps; [ ]; # missing inputs: pychannels "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook - "cisco_ios" = ps: with ps; [ pexpect]; + "cisco_ios" = ps: with ps; [ pexpect ]; "cisco_mobility_express" = ps: with ps; [ ]; # missing inputs: ciscomobilityexpress "cisco_webex_teams" = ps: with ps; [ ]; # missing inputs: webexteamssdk "citybikes" = ps: with ps; [ ]; @@ -120,44 +120,44 @@ "clicksend" = ps: with ps; [ ]; "clicksend_tts" = ps: with ps; [ ]; "climate" = ps: with ps; [ ]; - "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa]; + "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; "cloudflare" = ps: with ps; [ ]; # missing inputs: pycfdns "cmus" = ps: with ps; [ ]; # missing inputs: pycmus "co2signal" = ps: with ps; [ ]; # missing inputs: co2signal "coinbase" = ps: with ps; [ ]; # missing inputs: coinbase - "coinmarketcap" = ps: with ps; [ coinmarketcap]; + "coinmarketcap" = ps: with ps; [ coinmarketcap ]; "comed_hourly_pricing" = ps: with ps; [ ]; "comfoconnect" = ps: with ps; [ ]; # missing inputs: pycomfoconnect "command_line" = ps: with ps; [ ]; "concord232" = ps: with ps; [ ]; # missing inputs: concord232 - "config" = ps: with ps; [ aiohttp-cors]; + "config" = ps: with ps; [ aiohttp-cors ]; "configurator" = ps: with ps; [ ]; "control4" = ps: with ps; [ ]; # missing inputs: pyControl4 - "conversation" = ps: with ps; [ aiohttp-cors]; + "conversation" = ps: with ps; [ aiohttp-cors ]; "coolmaster" = ps: with ps; [ ]; # missing inputs: pycoolmasternet "coronavirus" = ps: with ps; [ ]; # missing inputs: coronavirus "counter" = ps: with ps; [ ]; "cover" = ps: with ps; [ ]; "cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy - "cpuspeed" = ps: with ps; [ py-cpuinfo]; + "cpuspeed" = ps: with ps; [ py-cpuinfo ]; "crimereports" = ps: with ps; [ ]; # missing inputs: crimereports - "cups" = ps: with ps; [ pycups]; + "cups" = ps: with ps; [ pycups ]; "currencylayer" = ps: with ps; [ ]; "daikin" = ps: with ps; [ ]; # missing inputs: pydaikin "danfoss_air" = ps: with ps; [ ]; # missing inputs: pydanfossair - "darksky" = ps: with ps; [ python-forecastio]; - "datadog" = ps: with ps; [ datadog]; + "darksky" = ps: with ps; [ python-forecastio ]; + "datadog" = ps: with ps; [ datadog ]; "ddwrt" = ps: with ps; [ ]; - "debugpy" = ps: with ps; [ debugpy]; + "debugpy" = ps: with ps; [ debugpy ]; "deconz" = ps: with ps; [ ]; # missing inputs: pydeconz - "decora" = ps: with ps; [ bluepy]; # missing inputs: decora + "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi - "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco sqlalchemy zeroconf]; # missing inputs: home-assistant-frontend + "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco sqlalchemy zeroconf ]; # missing inputs: home-assistant-frontend "delijn" = ps: with ps; [ ]; # missing inputs: pydelijn - "deluge" = ps: with ps; [ deluge-client]; - "demo" = ps: with ps; [ aiohttp-cors]; + "deluge" = ps: with ps; [ deluge-client ]; + "demo" = ps: with ps; [ aiohttp-cors ]; "denon" = ps: with ps; [ ]; - "denonavr" = ps: with ps; [ denonavr getmac]; + "denonavr" = ps: with ps; [ denonavr getmac ]; "derivative" = ps: with ps; [ ]; "deutsche_bahn" = ps: with ps; [ ]; # missing inputs: schiene "device_automation" = ps: with ps; [ ]; @@ -166,40 +166,40 @@ "devolo_home_control" = ps: with ps; [ ]; # missing inputs: devolo-home-control-api "dexcom" = ps: with ps; [ ]; # missing inputs: pydexcom "dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT - "dialogflow" = ps: with ps; [ aiohttp-cors]; - "digital_ocean" = ps: with ps; [ digital-ocean]; + "dialogflow" = ps: with ps; [ aiohttp-cors ]; + "digital_ocean" = ps: with ps; [ digital-ocean ]; "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower "directv" = ps: with ps; [ ]; # missing inputs: directv - "discogs" = ps: with ps; [ discogs_client]; - "discord" = ps: with ps; [ discordpy]; - "discovery" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; - "dlib_face_detect" = ps: with ps; [ face_recognition]; - "dlib_face_identify" = ps: with ps; [ face_recognition]; + "discogs" = ps: with ps; [ discogs_client ]; + "discord" = ps: with ps; [ discordpy ]; + "discovery" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; + "dlib_face_detect" = ps: with ps; [ face_recognition ]; + "dlib_face_identify" = ps: with ps; [ face_recognition ]; "dlink" = ps: with ps; [ ]; # missing inputs: pyW215 - "dlna_dmr" = ps: with ps; [ async-upnp-client]; - "dnsip" = ps: with ps; [ aiodns]; - "dominos" = ps: with ps; [ aiohttp-cors]; # missing inputs: pizzapi - "doods" = ps: with ps; [ pillow]; # missing inputs: pydoods - "doorbird" = ps: with ps; [ aiohttp-cors]; # missing inputs: doorbirdpy + "dlna_dmr" = ps: with ps; [ async-upnp-client ]; + "dnsip" = ps: with ps; [ aiodns ]; + "dominos" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pizzapi + "doods" = ps: with ps; [ pillow ]; # missing inputs: pydoods + "doorbird" = ps: with ps; [ aiohttp-cors ]; # missing inputs: doorbirdpy "dovado" = ps: with ps; [ ]; # missing inputs: dovado "downloader" = ps: with ps; [ ]; "dsmr" = ps: with ps; [ ]; # missing inputs: dsmr_parser - "dsmr_reader" = ps: with ps; [ aiohttp-cors paho-mqtt]; + "dsmr_reader" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "dte_energy_bridge" = ps: with ps; [ ]; "dublin_bus_transport" = ps: with ps; [ ]; "duckdns" = ps: with ps; [ ]; "dunehd" = ps: with ps; [ ]; # missing inputs: pdunehd - "dwd_weather_warnings" = ps: with ps; [ jsonpath xmltodict]; + "dwd_weather_warnings" = ps: with ps; [ jsonpath xmltodict ]; "dweet" = ps: with ps; [ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices - "dyson" = ps: with ps; [ aiohttp-cors zeroconf]; # missing inputs: libpurecool + "dyson" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: libpurecool "ebox" = ps: with ps; [ ]; # missing inputs: pyebox "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy "ecoal_boiler" = ps: with ps; [ ]; # missing inputs: ecoaliface "ecobee" = ps: with ps; [ ]; # missing inputs: python-ecobee-api "econet" = ps: with ps; [ ]; # missing inputs: pyeconet "ecovacs" = ps: with ps; [ ]; # missing inputs: sucks - "eddystone_temperature" = ps: with ps; [ construct]; # missing inputs: beacontools[scan] + "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools[scan] "edimax" = ps: with ps; [ ]; # missing inputs: pyedimax "edl21" = ps: with ps; [ ]; # missing inputs: pysml "ee_brightbox" = ps: with ps; [ ]; # missing inputs: eebrightbox @@ -213,9 +213,9 @@ "emby" = ps: with ps; [ ]; # missing inputs: pyemby "emoncms" = ps: with ps; [ ]; "emoncms_history" = ps: with ps; [ ]; - "emulated_hue" = ps: with ps; [ aiohttp-cors]; + "emulated_hue" = ps: with ps; [ aiohttp-cors ]; "emulated_roku" = ps: with ps; [ ]; # missing inputs: emulated_roku - "enigma2" = ps: with ps; [ openwebifpy]; + "enigma2" = ps: with ps; [ openwebifpy ]; "enocean" = ps: with ps; [ ]; # missing inputs: enocean "enphase_envoy" = ps: with ps; [ ]; # missing inputs: envoy_reader "entur_public_transport" = ps: with ps; [ ]; # missing inputs: enturclient @@ -225,8 +225,8 @@ "ephember" = ps: with ps; [ ]; # missing inputs: pyephember "epson" = ps: with ps; [ ]; # missing inputs: epson-projector "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter - "eq3btsmart" = ps: with ps; [ construct]; # missing inputs: python-eq3bt - "esphome" = ps: with ps; [ aioesphomeapi]; + "eq3btsmart" = ps: with ps; [ construct ]; # missing inputs: python-eq3bt + "esphome" = ps: with ps; [ aioesphomeapi ]; "essent" = ps: with ps; [ ]; # missing inputs: PyEssent "etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api "eufy" = ps: with ps; [ ]; # missing inputs: lakeside @@ -240,17 +240,17 @@ "fan" = ps: with ps; [ ]; "fastdotcom" = ps: with ps; [ ]; # missing inputs: fastdotcom "feedreader" = ps: with ps; [ ]; # missing inputs: feedparser-homeassistant - "ffmpeg" = ps: with ps; [ ha-ffmpeg]; - "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg]; - "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg]; + "ffmpeg" = ps: with ps; [ ha-ffmpeg ]; + "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ]; + "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ]; "fibaro" = ps: with ps; [ ]; # missing inputs: fiblary3 "fido" = ps: with ps; [ ]; # missing inputs: pyfido "file" = ps: with ps; [ ]; "filesize" = ps: with ps; [ ]; - "filter" = ps: with ps; [ aiohttp-cors sqlalchemy]; - "fints" = ps: with ps; [ fints]; + "filter" = ps: with ps; [ aiohttp-cors sqlalchemy ]; + "fints" = ps: with ps; [ fints ]; "firmata" = ps: with ps; [ ]; # missing inputs: pymata-express - "fitbit" = ps: with ps; [ aiohttp-cors fitbit]; + "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; "fixer" = ps: with ps; [ ]; # missing inputs: fixerio "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist "flexit" = ps: with ps; [ ]; # missing inputs: pyflexit pymodbus @@ -260,23 +260,23 @@ "flume" = ps: with ps; [ ]; # missing inputs: pyflume "flunearyou" = ps: with ps; [ ]; # missing inputs: pyflunearyou "flux" = ps: with ps; [ ]; - "flux_led" = ps: with ps; [ flux-led]; + "flux_led" = ps: with ps; [ flux-led ]; "folder" = ps: with ps; [ ]; - "folder_watcher" = ps: with ps; [ watchdog]; + "folder_watcher" = ps: with ps; [ watchdog ]; "foobot" = ps: with ps; [ ]; # missing inputs: foobot_async "forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java "fortios" = ps: with ps; [ ]; # missing inputs: fortiosapi "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam - "foursquare" = ps: with ps; [ aiohttp-cors]; + "foursquare" = ps: with ps; [ aiohttp-cors ]; "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms - "freebox" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: aiofreepybox + "freebox" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: aiofreepybox "freedns" = ps: with ps; [ ]; - "fritz" = ps: with ps; [ fritzconnection]; - "fritzbox" = ps: with ps; [ pyfritzhome]; - "fritzbox_callmonitor" = ps: with ps; [ fritzconnection]; - "fritzbox_netmonitor" = ps: with ps; [ fritzconnection]; + "fritz" = ps: with ps; [ fritzconnection ]; + "fritzbox" = ps: with ps; [ pyfritzhome ]; + "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; + "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; "fronius" = ps: with ps; [ ]; # missing inputs: pyfronius - "frontend" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "frontend" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend "frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi "futurenow" = ps: with ps; [ ]; # missing inputs: pyfnip "garadget" = ps: with ps; [ ]; @@ -290,29 +290,29 @@ "geo_json_events" = ps: with ps; [ ]; # missing inputs: geojson_client "geo_location" = ps: with ps; [ ]; "geo_rss_events" = ps: with ps; [ ]; # missing inputs: georss_generic_client - "geofency" = ps: with ps; [ aiohttp-cors]; + "geofency" = ps: with ps; [ aiohttp-cors ]; "geonetnz_quakes" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_quakes "geonetnz_volcano" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_volcano "gios" = ps: with ps; [ ]; # missing inputs: gios - "github" = ps: with ps; [ PyGithub]; - "gitlab_ci" = ps: with ps; [ python-gitlab]; + "github" = ps: with ps; [ PyGithub ]; + "gitlab_ci" = ps: with ps; [ python-gitlab ]; "gitter" = ps: with ps; [ ]; # missing inputs: gitterpy "glances" = ps: with ps; [ ]; # missing inputs: glances_api "gntp" = ps: with ps; [ ]; # missing inputs: gntp "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher "gogogate2" = ps: with ps; [ ]; # missing inputs: gogogate2-api - "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client]; - "google_assistant" = ps: with ps; [ aiohttp-cors]; - "google_cloud" = ps: with ps; [ google_cloud_texttospeech]; + "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ]; + "google_assistant" = ps: with ps; [ aiohttp-cors ]; + "google_cloud" = ps: with ps; [ google_cloud_texttospeech ]; "google_domains" = ps: with ps; [ ]; "google_maps" = ps: with ps; [ ]; # missing inputs: locationsharinglib - "google_pubsub" = ps: with ps; [ google_cloud_pubsub]; - "google_translate" = ps: with ps; [ gtts-token]; + "google_pubsub" = ps: with ps; [ google_cloud_pubsub ]; + "google_translate" = ps: with ps; [ gtts-token ]; "google_travel_time" = ps: with ps; [ ]; # missing inputs: googlemaps "google_wifi" = ps: with ps; [ ]; - "gpmdp" = ps: with ps; [ websocket_client]; + "gpmdp" = ps: with ps; [ websocket_client ]; "gpsd" = ps: with ps; [ ]; # missing inputs: gps3 - "gpslogger" = ps: with ps; [ aiohttp-cors]; + "gpslogger" = ps: with ps; [ aiohttp-cors ]; "graphite" = ps: with ps; [ ]; "greeneye_monitor" = ps: with ps; [ ]; # missing inputs: greeneye_monitor "greenwave" = ps: with ps; [ ]; # missing inputs: greenwavereality @@ -325,8 +325,8 @@ "habitica" = ps: with ps; [ ]; # missing inputs: habitipy "hangouts" = ps: with ps; [ ]; # missing inputs: hangups "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr - "harmony" = ps: with ps; [ aioharmony]; - "hassio" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "harmony" = ps: with ps; [ aioharmony ]; + "hassio" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend "haveibeenpwned" = ps: with ps; [ ]; "hddtemp" = ps: with ps; [ ]; "hdmi_cec" = ps: with ps; [ ]; # missing inputs: pyCEC @@ -336,27 +336,27 @@ "hikvision" = ps: with ps; [ ]; # missing inputs: pyhik "hikvisioncam" = ps: with ps; [ ]; # missing inputs: hikvision "hisense_aehw4a1" = ps: with ps; [ ]; # missing inputs: pyaehw4a1 - "history" = ps: with ps; [ aiohttp-cors sqlalchemy]; - "history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy]; + "history" = ps: with ps; [ aiohttp-cors sqlalchemy ]; + "history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "hitron_coda" = ps: with ps; [ ]; "hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16 - "home_connect" = ps: with ps; [ aiohttp-cors]; # missing inputs: homeconnect + "home_connect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: homeconnect "homeassistant" = ps: with ps; [ ]; - "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg zeroconf]; # missing inputs: PyTurboJPEG base36 fnvhash - "homekit_controller" = ps: with ps; [ aiohttp-cors zeroconf]; # missing inputs: aiohomekit[IP] - "homematic" = ps: with ps; [ pyhomematic]; + "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg zeroconf ]; # missing inputs: PyTurboJPEG base36 fnvhash + "homekit_controller" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: aiohomekit[IP] + "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip "homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks "honeywell" = ps: with ps; [ ]; # missing inputs: somecomfort "horizon" = ps: with ps; [ ]; # missing inputs: horimote "hp_ilo" = ps: with ps; [ ]; # missing inputs: python-hpilo - "html5" = ps: with ps; [ aiohttp-cors pywebpush]; - "http" = ps: with ps; [ aiohttp-cors]; + "html5" = ps: with ps; [ aiohttp-cors pywebpush ]; + "http" = ps: with ps; [ aiohttp-cors ]; "htu21d" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi - "huawei_lte" = ps: with ps; [ getmac stringcase]; # missing inputs: huawei-lte-api url-normalize + "huawei_lte" = ps: with ps; [ getmac stringcase ]; # missing inputs: huawei-lte-api url-normalize "huawei_router" = ps: with ps; [ ]; - "hue" = ps: with ps; [ aiohue]; + "hue" = ps: with ps; [ aiohue ]; "humidifier" = ps: with ps; [ ]; "hunterdouglas_powerview" = ps: with ps; [ ]; # missing inputs: aiopvapi "hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti @@ -365,17 +365,17 @@ "ialarm" = ps: with ps; [ ]; # missing inputs: pyialarm "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter "iaqualink" = ps: with ps; [ ]; # missing inputs: iaqualink - "icloud" = ps: with ps; [ pyicloud]; + "icloud" = ps: with ps; [ pyicloud ]; "idteck_prox" = ps: with ps; [ ]; # missing inputs: rfk101py - "ifttt" = ps: with ps; [ aiohttp-cors pyfttt]; + "ifttt" = ps: with ps; [ aiohttp-cors pyfttt ]; "iglo" = ps: with ps; [ ]; # missing inputs: iglo "ign_sismologia" = ps: with ps; [ ]; # missing inputs: georss_ign_sismologia_client - "ihc" = ps: with ps; [ defusedxml]; # missing inputs: ihcsdk - "image_processing" = ps: with ps; [ aiohttp-cors]; + "ihc" = ps: with ps; [ defusedxml ]; # missing inputs: ihcsdk + "image_processing" = ps: with ps; [ aiohttp-cors ]; "imap" = ps: with ps; [ ]; # missing inputs: aioimaplib "imap_email_content" = ps: with ps; [ ]; "incomfort" = ps: with ps; [ ]; # missing inputs: incomfort-client - "influxdb" = ps: with ps; [ influxdb-client influxdb]; + "influxdb" = ps: with ps; [ influxdb-client influxdb ]; "input_boolean" = ps: with ps; [ ]; "input_datetime" = ps: with ps; [ ]; "input_number" = ps: with ps; [ ]; @@ -383,15 +383,15 @@ "input_text" = ps: with ps; [ ]; "insteon" = ps: with ps; [ ]; # missing inputs: pyinsteon "integration" = ps: with ps; [ ]; - "intent" = ps: with ps; [ aiohttp-cors]; + "intent" = ps: with ps; [ aiohttp-cors ]; "intent_script" = ps: with ps; [ ]; "intesishome" = ps: with ps; [ ]; # missing inputs: pyintesishome - "ios" = ps: with ps; [ aiohttp-cors zeroconf]; + "ios" = ps: with ps; [ aiohttp-cors zeroconf ]; "iota" = ps: with ps; [ ]; # missing inputs: pyota "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3 "ipma" = ps: with ps; [ ]; # missing inputs: pyipma - "ipp" = ps: with ps; [ pyipp]; - "iqvia" = ps: with ps; [ numpy]; # missing inputs: pyiqvia + "ipp" = ps: with ps; [ pyipp ]; + "iqvia" = ps: with ps; [ numpy ]; # missing inputs: pyiqvia "irish_rail_transport" = ps: with ps; [ ]; # missing inputs: pyirishrail "islamic_prayer_times" = ps: with ps; [ ]; # missing inputs: prayer_times_calculator "iss" = ps: with ps; [ ]; # missing inputs: pyiss @@ -406,92 +406,92 @@ "kankun" = ps: with ps; [ ]; "keba" = ps: with ps; [ ]; # missing inputs: keba-kecontact "keenetic_ndms2" = ps: with ps; [ ]; # missing inputs: ndms2_client - "kef" = ps: with ps; [ getmac]; # missing inputs: aiokef + "kef" = ps: with ps; [ getmac ]; # missing inputs: aiokef "keyboard" = ps: with ps; [ ]; # missing inputs: pyuserinput - "keyboard_remote" = ps: with ps; [ evdev]; # missing inputs: aionotify + "keyboard_remote" = ps: with ps; [ evdev ]; # missing inputs: aionotify "kira" = ps: with ps; [ ]; # missing inputs: pykira "kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client "knx" = ps: with ps; [ ]; # missing inputs: xknx - "kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket]; - "konnected" = ps: with ps; [ aiohttp-cors]; # missing inputs: konnected + "kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ]; + "konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected "kwb" = ps: with ps; [ ]; # missing inputs: pykwb "lacrosse" = ps: with ps; [ ]; # missing inputs: pylacrosse "lametric" = ps: with ps; [ ]; # missing inputs: lmnotify "lannouncer" = ps: with ps; [ ]; - "lastfm" = ps: with ps; [ pylast]; + "lastfm" = ps: with ps; [ pylast ]; "launch_library" = ps: with ps; [ ]; # missing inputs: pylaunches "lcn" = ps: with ps; [ ]; # missing inputs: pypck "lg_netcast" = ps: with ps; [ ]; # missing inputs: pylgnetcast-homeassistant "lg_soundbar" = ps: with ps; [ ]; # missing inputs: temescal "life360" = ps: with ps; [ ]; # missing inputs: life360 - "lifx" = ps: with ps; [ aiolifx aiolifx-effects]; + "lifx" = ps: with ps; [ aiolifx aiolifx-effects ]; "lifx_cloud" = ps: with ps; [ ]; "lifx_legacy" = ps: with ps; [ ]; # missing inputs: liffylights "light" = ps: with ps; [ ]; "lightwave" = ps: with ps; [ ]; # missing inputs: lightwave - "limitlessled" = ps: with ps; [ limitlessled]; + "limitlessled" = ps: with ps; [ limitlessled ]; "linksys_smart" = ps: with ps; [ ]; - "linode" = ps: with ps; [ linode-api]; - "linux_battery" = ps: with ps; [ batinfo]; + "linode" = ps: with ps; [ linode-api ]; + "linux_battery" = ps: with ps; [ batinfo ]; "lirc" = ps: with ps; [ ]; # missing inputs: python-lirc "litejet" = ps: with ps; [ ]; # missing inputs: pylitejet "llamalab_automate" = ps: with ps; [ ]; "local_file" = ps: with ps; [ ]; "local_ip" = ps: with ps; [ ]; - "locative" = ps: with ps; [ aiohttp-cors]; + "locative" = ps: with ps; [ aiohttp-cors ]; "lock" = ps: with ps; [ ]; - "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend + "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ]; # missing inputs: home-assistant-frontend "logentries" = ps: with ps; [ ]; "logger" = ps: with ps; [ ]; - "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg]; # missing inputs: logi_circle + "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg ]; # missing inputs: logi_circle "london_air" = ps: with ps; [ ]; "london_underground" = ps: with ps; [ ]; # missing inputs: london-tube-status "loopenergy" = ps: with ps; [ ]; # missing inputs: pyloopenergy "lovelace" = ps: with ps; [ ]; - "luci" = ps: with ps; [ openwrt-luci-rpc]; - "luftdaten" = ps: with ps; [ luftdaten]; + "luci" = ps: with ps; [ openwrt-luci-rpc ]; + "luftdaten" = ps: with ps; [ luftdaten ]; "lupusec" = ps: with ps; [ ]; # missing inputs: lupupy "lutron" = ps: with ps; [ ]; # missing inputs: pylutron "lutron_caseta" = ps: with ps; [ ]; # missing inputs: pylutron-caseta "lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12 "lyft" = ps: with ps; [ ]; # missing inputs: lyft_rides "magicseaweed" = ps: with ps; [ ]; # missing inputs: magicseaweed - "mailbox" = ps: with ps; [ aiohttp-cors]; - "mailgun" = ps: with ps; [ aiohttp-cors]; # missing inputs: pymailgunner + "mailbox" = ps: with ps; [ aiohttp-cors ]; + "mailgun" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymailgunner "manual" = ps: with ps; [ ]; - "manual_mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "map" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "manual_mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "map" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend "marytts" = ps: with ps; [ ]; # missing inputs: speak2mary "mastodon" = ps: with ps; [ ]; # missing inputs: Mastodon.py - "matrix" = ps: with ps; [ matrix-client]; + "matrix" = ps: with ps; [ matrix-client ]; "maxcube" = ps: with ps; [ ]; # missing inputs: maxcube-api "mcp23017" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-blinka adafruit-circuitpython-mcp230xx - "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light]; - "media_player" = ps: with ps; [ aiohttp-cors]; + "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ]; + "media_player" = ps: with ps; [ aiohttp-cors ]; "mediaroom" = ps: with ps; [ ]; # missing inputs: pymediaroom "melcloud" = ps: with ps; [ ]; # missing inputs: pymelcloud "melissa" = ps: with ps; [ ]; # missing inputs: py-melissa-climate - "meraki" = ps: with ps; [ aiohttp-cors]; + "meraki" = ps: with ps; [ aiohttp-cors ]; "message_bird" = ps: with ps; [ ]; # missing inputs: messagebird - "met" = ps: with ps; [ pymetno]; + "met" = ps: with ps; [ pymetno ]; "meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance-api "meteoalarm" = ps: with ps; [ ]; # missing inputs: meteoalertapi "metoffice" = ps: with ps; [ ]; # missing inputs: datapoint "mfi" = ps: with ps; [ ]; # missing inputs: mficlient "mhz19" = ps: with ps; [ ]; # missing inputs: pmsensor "microsoft" = ps: with ps; [ ]; # missing inputs: pycsspeechtts - "microsoft_face" = ps: with ps; [ aiohttp-cors]; - "microsoft_face_detect" = ps: with ps; [ aiohttp-cors]; - "microsoft_face_identify" = ps: with ps; [ aiohttp-cors]; - "miflora" = ps: with ps; [ bluepy]; # missing inputs: miflora + "microsoft_face" = ps: with ps; [ aiohttp-cors ]; + "microsoft_face_detect" = ps: with ps; [ aiohttp-cors ]; + "microsoft_face_identify" = ps: with ps; [ aiohttp-cors ]; + "miflora" = ps: with ps; [ bluepy ]; # missing inputs: miflora "mikrotik" = ps: with ps; [ ]; # missing inputs: librouteros "mill" = ps: with ps; [ ]; # missing inputs: millheater "min_max" = ps: with ps; [ ]; - "minecraft_server" = ps: with ps; [ aiodns getmac]; # missing inputs: mcstatus - "minio" = ps: with ps; [ minio]; + "minecraft_server" = ps: with ps; [ aiodns getmac ]; # missing inputs: mcstatus + "minio" = ps: with ps; [ minio ]; "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt "mjpeg" = ps: with ps; [ ]; - "mobile_app" = ps: with ps; [ pynacl aiohttp-cors emoji hass-nabucasa]; + "mobile_app" = ps: with ps; [ pynacl aiohttp-cors emoji hass-nabucasa ]; "mochad" = ps: with ps; [ ]; # missing inputs: pymochad "modbus" = ps: with ps; [ ]; # missing inputs: pymodbus "modem_callerid" = ps: with ps; [ ]; # missing inputs: basicmodem @@ -499,34 +499,34 @@ "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice "moon" = ps: with ps; [ ]; "mpchc" = ps: with ps; [ ]; - "mpd" = ps: with ps; [ mpd2]; - "mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "mqtt_eventstream" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "mqtt_json" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "mqtt_room" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "mqtt_statestream" = ps: with ps; [ aiohttp-cors paho-mqtt]; + "mpd" = ps: with ps; [ mpd2 ]; + "mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "mqtt_eventstream" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "mqtt_json" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "mqtt_room" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "mqtt_statestream" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "msteams" = ps: with ps; [ ]; # missing inputs: pymsteams - "mvglive" = ps: with ps; [ PyMVGLive]; + "mvglive" = ps: with ps; [ PyMVGLive ]; "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy "mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi "myq" = ps: with ps; [ ]; # missing inputs: pymyq - "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt]; # missing inputs: pymysensors - "mystrom" = ps: with ps; [ aiohttp-cors]; # missing inputs: python-mystrom + "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: pymysensors + "mystrom" = ps: with ps; [ aiohttp-cors ]; # missing inputs: python-mystrom "mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns "n26" = ps: with ps; [ ]; # missing inputs: n26 "nad" = ps: with ps; [ ]; # missing inputs: nad_receiver - "namecheapdns" = ps: with ps; [ defusedxml]; - "nanoleaf" = ps: with ps; [ pynanoleaf]; - "neato" = ps: with ps; [ pybotvac]; + "namecheapdns" = ps: with ps; [ defusedxml ]; + "nanoleaf" = ps: with ps; [ pynanoleaf ]; + "neato" = ps: with ps; [ pybotvac ]; "nederlandse_spoorwegen" = ps: with ps; [ ]; # missing inputs: nsapi "nello" = ps: with ps; [ ]; # missing inputs: pynello "ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient "nest" = ps: with ps; [ ]; # missing inputs: python-nest - "netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo]; + "netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo ]; "netdata" = ps: with ps; [ ]; # missing inputs: netdata "netgear" = ps: with ps; [ ]; # missing inputs: pynetgear "netgear_lte" = ps: with ps; [ ]; # missing inputs: eternalegypt - "netio" = ps: with ps; [ aiohttp-cors]; # missing inputs: pynetio + "netio" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pynetio "neurio_energy" = ps: with ps; [ ]; # missing inputs: neurio "nexia" = ps: with ps; [ ]; # missing inputs: nexia "nextbus" = ps: with ps; [ ]; # missing inputs: py_nextbusnext @@ -535,11 +535,11 @@ "niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control "nilu" = ps: with ps; [ ]; # missing inputs: niluclient "nissan_leaf" = ps: with ps; [ ]; # missing inputs: pycarwings2 - "nmap_tracker" = ps: with ps; [ getmac]; # missing inputs: python-nmap + "nmap_tracker" = ps: with ps; [ getmac ]; # missing inputs: python-nmap "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail "no_ip" = ps: with ps; [ ]; "noaa_tides" = ps: with ps; [ ]; # missing inputs: py_noaa - "norway_air" = ps: with ps; [ pymetno]; + "norway_air" = ps: with ps; [ pymetno ]; "notify" = ps: with ps; [ ]; "notify_events" = ps: with ps; [ ]; # missing inputs: notify-events "notion" = ps: with ps; [ ]; # missing inputs: aionotion @@ -555,17 +555,17 @@ "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics "obihai" = ps: with ps; [ ]; # missing inputs: pyobihai - "octoprint" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; + "octoprint" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; "oem" = ps: with ps; [ ]; # missing inputs: oemthermostat - "ohmconnect" = ps: with ps; [ defusedxml]; + "ohmconnect" = ps: with ps; [ defusedxml ]; "ombi" = ps: with ps; [ ]; # missing inputs: pyombi - "onboarding" = ps: with ps; [ aiohttp-cors]; + "onboarding" = ps: with ps; [ aiohttp-cors ]; "onewire" = ps: with ps; [ ]; # missing inputs: pyownet - "onkyo" = ps: with ps; [ onkyo-eiscp]; - "onvif" = ps: with ps; [ ha-ffmpeg]; # missing inputs: WSDiscovery onvif-zeep-async + "onkyo" = ps: with ps; [ onkyo-eiscp ]; + "onvif" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: WSDiscovery onvif-zeep-async "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ ]; - "opencv" = ps: with ps; [ numpy]; # missing inputs: opencv-python-headless + "opencv" = ps: with ps; [ numpy ]; # missing inputs: opencv-python-headless "openerz" = ps: with ps; [ ]; # missing inputs: openerz-api "openevse" = ps: with ps; [ ]; # missing inputs: openevsewifi "openexchangerates" = ps: with ps; [ ]; @@ -576,22 +576,22 @@ "opensky" = ps: with ps; [ ]; "opentherm_gw" = ps: with ps; [ ]; # missing inputs: pyotgw "openuv" = ps: with ps; [ ]; # missing inputs: pyopenuv - "openweathermap" = ps: with ps; [ pyowm]; + "openweathermap" = ps: with ps; [ pyowm ]; "opnsense" = ps: with ps; [ ]; # missing inputs: pyopnsense "opple" = ps: with ps; [ ]; # missing inputs: pyoppleio "orangepi_gpio" = ps: with ps; [ ]; # missing inputs: OPi.GPIO "oru" = ps: with ps; [ ]; # missing inputs: oru "orvibo" = ps: with ps; [ ]; # missing inputs: orvibo "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify - "otp" = ps: with ps; [ pyotp]; + "otp" = ps: with ps; [ pyotp ]; "ovo_energy" = ps: with ps; [ ]; # missing inputs: ovoenergy - "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt]; - "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt]; # missing inputs: python-openzwave-mqtt + "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt ]; + "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: python-openzwave-mqtt "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera - "pandora" = ps: with ps; [ pexpect]; - "panel_custom" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend - "panel_iframe" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "pandora" = ps: with ps; [ pexpect ]; + "panel_custom" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend + "panel_iframe" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend "pcal9535a" = ps: with ps; [ ]; # missing inputs: pcal9535a "pencom" = ps: with ps; [ ]; # missing inputs: pencompy "persistent_notification" = ps: with ps; [ ]; @@ -605,41 +605,41 @@ "ping" = ps: with ps; [ ]; "pioneer" = ps: with ps; [ ]; "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 - "plaato" = ps: with ps; [ aiohttp-cors]; - "plant" = ps: with ps; [ sqlalchemy]; - "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos]; + "plaato" = ps: with ps; [ aiohttp-cors ]; + "plant" = ps: with ps; [ sqlalchemy ]; + "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ]; "plugwise" = ps: with ps; [ ]; # missing inputs: Plugwise_Smile "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad "pocketcasts" = ps: with ps; [ ]; # missing inputs: pocketcasts - "point" = ps: with ps; [ aiohttp-cors]; # missing inputs: pypoint + "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint "poolsense" = ps: with ps; [ ]; # missing inputs: poolsense "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall "prezzibenzina" = ps: with ps; [ ]; # missing inputs: prezzibenzina-py "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix - "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client]; + "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ]; "prowl" = ps: with ps; [ ]; "proximity" = ps: with ps; [ ]; "proxmoxve" = ps: with ps; [ ]; # missing inputs: proxmoxer - "proxy" = ps: with ps; [ pillow]; + "proxy" = ps: with ps; [ pillow ]; "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen "ptvsd" = ps: with ps; [ ]; # missing inputs: ptvsd - "pulseaudio_loopback" = ps: with ps; [ pulsectl]; - "push" = ps: with ps; [ aiohttp-cors]; - "pushbullet" = ps: with ps; [ pushbullet]; - "pushover" = ps: with ps; [ pushover-complete]; + "pulseaudio_loopback" = ps: with ps; [ pulsectl ]; + "push" = ps: with ps; [ aiohttp-cors ]; + "pushbullet" = ps: with ps; [ pushbullet ]; + "pushover" = ps: with ps; [ pushover-complete ]; "pushsafer" = ps: with ps; [ ]; - "pvoutput" = ps: with ps; [ jsonpath xmltodict]; + "pvoutput" = ps: with ps; [ jsonpath xmltodict ]; "pvpc_hourly_pricing" = ps: with ps; [ ]; # missing inputs: aiopvpc "pyload" = ps: with ps; [ ]; - "python_script" = ps: with ps; [ restrictedpython]; + "python_script" = ps: with ps; [ restrictedpython ]; "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent "qld_bushfire" = ps: with ps; [ ]; # missing inputs: georss_qld_bushfire_alert_client "qnap" = ps: with ps; [ ]; # missing inputs: qnapstats - "qrcode" = ps: with ps; [ pillow]; # missing inputs: pyzbar + "qrcode" = ps: with ps; [ pillow ]; # missing inputs: pyzbar "quantum_gateway" = ps: with ps; [ ]; # missing inputs: quantum-gateway "qvr_pro" = ps: with ps; [ ]; # missing inputs: pyqvrpro "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch - "rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: rachiopy + "rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: rachiopy "radarr" = ps: with ps; [ ]; "radiotherm" = ps: with ps; [ ]; # missing inputs: radiotherm "rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird @@ -650,66 +650,66 @@ "raspihats" = ps: with ps; [ ]; # missing inputs: raspihats smbus-cffi "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client "recollect_waste" = ps: with ps; [ ]; # missing inputs: recollect-waste - "recorder" = ps: with ps; [ sqlalchemy]; + "recorder" = ps: with ps; [ sqlalchemy ]; "recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch - "reddit" = ps: with ps; [ praw]; + "reddit" = ps: with ps; [ praw ]; "rejseplanen" = ps: with ps; [ ]; # missing inputs: rjpl - "remember_the_milk" = ps: with ps; [ httplib2]; # missing inputs: RtmAPI + "remember_the_milk" = ps: with ps; [ httplib2 ]; # missing inputs: RtmAPI "remote" = ps: with ps; [ ]; "remote_rpi_gpio" = ps: with ps; [ ]; # missing inputs: gpiozero "repetier" = ps: with ps; [ ]; # missing inputs: pyrepetier - "rest" = ps: with ps; [ jsonpath xmltodict]; + "rest" = ps: with ps; [ jsonpath xmltodict ]; "rest_command" = ps: with ps; [ ]; "rflink" = ps: with ps; [ ]; # missing inputs: rflink "rfxtrx" = ps: with ps; [ ]; # missing inputs: pyRFXtrx - "ring" = ps: with ps; [ ha-ffmpeg]; # missing inputs: ring_doorbell + "ring" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: ring_doorbell "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api - "rmvtransport" = ps: with ps; [ PyRMVtransport]; + "rmvtransport" = ps: with ps; [ PyRMVtransport ]; "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "roku" = ps: with ps; [ ]; # missing inputs: rokuecp "roomba" = ps: with ps; [ ]; # missing inputs: roombapy - "route53" = ps: with ps; [ boto3]; + "route53" = ps: with ps; [ boto3 ]; "rova" = ps: with ps; [ ]; # missing inputs: rova "rpi_camera" = ps: with ps; [ ]; "rpi_gpio" = ps: with ps; [ ]; # missing inputs: RPi.GPIO "rpi_gpio_pwm" = ps: with ps; [ ]; # missing inputs: pwmled "rpi_pfio" = ps: with ps; [ ]; # missing inputs: pifacecommon pifacedigitalio "rpi_rf" = ps: with ps; [ ]; # missing inputs: rpi-rf - "rss_feed_template" = ps: with ps; [ aiohttp-cors]; + "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; "rtorrent" = ps: with ps; [ ]; "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound - "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: pysabnzbd - "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: home-assistant-frontend + "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: pysabnzbd + "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: home-assistant-frontend "saj" = ps: with ps; [ ]; # missing inputs: pysaj "salt" = ps: with ps; [ ]; # missing inputs: saltbox - "samsungtv" = ps: with ps; [ ]; # missing inputs: samsungctl[websocket] samsungtvws[websocket] + "samsungtv" = ps: with ps; [ samsungctl samsungtvws ]; "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra "scene" = ps: with ps; [ ]; "schluter" = ps: with ps; [ ]; # missing inputs: py-schluter - "scrape" = ps: with ps; [ beautifulsoup4 jsonpath xmltodict]; + "scrape" = ps: with ps; [ beautifulsoup4 jsonpath xmltodict ]; "script" = ps: with ps; [ ]; "scsgate" = ps: with ps; [ ]; # missing inputs: scsgate - "search" = ps: with ps; [ aiohttp-cors]; - "season" = ps: with ps; [ ephem]; + "search" = ps: with ps; [ aiohttp-cors ]; + "season" = ps: with ps; [ ephem ]; "sendgrid" = ps: with ps; [ ]; # missing inputs: sendgrid "sense" = ps: with ps; [ ]; # missing inputs: sense_energy "sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat "sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo "sensor" = ps: with ps; [ ]; - "sentry" = ps: with ps; [ sentry-sdk]; - "serial" = ps: with ps; [ pyserial-asyncio]; + "sentry" = ps: with ps; [ sentry-sdk ]; + "serial" = ps: with ps; [ pyserial-asyncio ]; "serial_pm" = ps: with ps; [ ]; # missing inputs: pmsensor "sesame" = ps: with ps; [ ]; # missing inputs: pysesame2 - "seven_segments" = ps: with ps; [ pillow]; + "seven_segments" = ps: with ps; [ pillow ]; "seventeentrack" = ps: with ps; [ ]; # missing inputs: py17track "shell_command" = ps: with ps; [ ]; - "shiftr" = ps: with ps; [ paho-mqtt]; - "shodan" = ps: with ps; [ shodan]; - "shopping_list" = ps: with ps; [ aiohttp-cors]; + "shiftr" = ps: with ps; [ paho-mqtt ]; + "shodan" = ps: with ps; [ shodan ]; + "shopping_list" = ps: with ps; [ aiohttp-cors ]; "sht31" = ps: with ps; [ ]; # missing inputs: Adafruit-GPIO Adafruit-SHT31 "sigfox" = ps: with ps; [ ]; - "sighthound" = ps: with ps; [ pillow]; # missing inputs: simplehound + "sighthound" = ps: with ps; [ pillow ]; # missing inputs: simplehound "signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi "simplepush" = ps: with ps; [ ]; # missing inputs: simplepush "simplisafe" = ps: with ps; [ ]; # missing inputs: simplisafe-python @@ -723,51 +723,51 @@ "sleepiq" = ps: with ps; [ ]; # missing inputs: sleepyq "slide" = ps: with ps; [ ]; # missing inputs: goslide-api "sma" = ps: with ps; [ ]; # missing inputs: pysma - "smappee" = ps: with ps; [ aiohttp-cors]; # missing inputs: pysmappee + "smappee" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pysmappee "smarthab" = ps: with ps; [ ]; # missing inputs: smarthab - "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: pysmartapp pysmartthings + "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: pysmartapp pysmartthings "smarty" = ps: with ps; [ ]; # missing inputs: pysmarty "smhi" = ps: with ps; [ ]; # missing inputs: smhi-pkg "sms" = ps: with ps; [ ]; # missing inputs: python-gammu "smtp" = ps: with ps; [ ]; - "snapcast" = ps: with ps; [ snapcast]; - "snips" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "snmp" = ps: with ps; [ pysnmp]; + "snapcast" = ps: with ps; [ snapcast ]; + "snips" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "snmp" = ps: with ps; [ pysnmp ]; "sochain" = ps: with ps; [ ]; # missing inputs: python-sochain-api "socialblade" = ps: with ps; [ ]; # missing inputs: socialbladeclient - "solaredge" = ps: with ps; [ stringcase]; # missing inputs: solaredge + "solaredge" = ps: with ps; [ stringcase ]; # missing inputs: solaredge "solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local "solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher "solax" = ps: with ps; [ ]; # missing inputs: solax "soma" = ps: with ps; [ ]; # missing inputs: pysoma - "somfy" = ps: with ps; [ aiohttp-cors]; # missing inputs: pymfy + "somfy" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymfy "somfy_mylink" = ps: with ps; [ ]; # missing inputs: somfy-mylink-synergy "sonarr" = ps: with ps; [ ]; # missing inputs: sonarr "songpal" = ps: with ps; [ ]; # missing inputs: python-songpal - "sonos" = ps: with ps; [ pysonos]; + "sonos" = ps: with ps; [ pysonos ]; "sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp - "soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch zeroconf]; - "spaceapi" = ps: with ps; [ aiohttp-cors]; + "soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch zeroconf ]; + "spaceapi" = ps: with ps; [ aiohttp-cors ]; "spc" = ps: with ps; [ ]; # missing inputs: pyspcwebgw - "speedtestdotnet" = ps: with ps; [ speedtest-cli]; + "speedtestdotnet" = ps: with ps; [ speedtest-cli ]; "spider" = ps: with ps; [ ]; # missing inputs: spiderpy "splunk" = ps: with ps; [ ]; "spotcrime" = ps: with ps; [ ]; # missing inputs: spotcrime - "spotify" = ps: with ps; [ aiohttp-cors spotipy]; - "sql" = ps: with ps; [ sqlalchemy]; + "spotify" = ps: with ps; [ aiohttp-cors spotipy ]; + "sql" = ps: with ps; [ sqlalchemy ]; "squeezebox" = ps: with ps; [ ]; # missing inputs: pysqueezebox - "ssdp" = ps: with ps; [ aiohttp-cors defusedxml netdisco zeroconf]; + "ssdp" = ps: with ps; [ aiohttp-cors defusedxml netdisco zeroconf ]; "starline" = ps: with ps; [ ]; # missing inputs: starline "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank - "startca" = ps: with ps; [ xmltodict]; - "statistics" = ps: with ps; [ sqlalchemy]; - "statsd" = ps: with ps; [ statsd]; + "startca" = ps: with ps; [ xmltodict ]; + "statistics" = ps: with ps; [ sqlalchemy ]; + "statsd" = ps: with ps; [ statsd ]; "steam_online" = ps: with ps; [ ]; # missing inputs: steamodd "stiebel_eltron" = ps: with ps; [ ]; # missing inputs: pymodbus pystiebeleltron "stookalert" = ps: with ps; [ ]; # missing inputs: stookalert - "stream" = ps: with ps; [ aiohttp-cors av]; + "stream" = ps: with ps; [ aiohttp-cors av ]; "streamlabswater" = ps: with ps; [ ]; # missing inputs: streamlabswater - "stt" = ps: with ps; [ aiohttp-cors]; + "stt" = ps: with ps; [ aiohttp-cors ]; "suez_water" = ps: with ps; [ ]; # missing inputs: pysuez "sun" = ps: with ps; [ ]; "supervisord" = ps: with ps; [ ]; @@ -786,9 +786,9 @@ "synology_dsm" = ps: with ps; [ ]; # missing inputs: python-synology "synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm "syslog" = ps: with ps; [ ]; - "system_health" = ps: with ps; [ aiohttp-cors]; - "system_log" = ps: with ps; [ aiohttp-cors]; - "systemmonitor" = ps: with ps; [ psutil]; + "system_health" = ps: with ps; [ aiohttp-cors ]; + "system_log" = ps: with ps; [ aiohttp-cors ]; + "systemmonitor" = ps: with ps; [ psutil ]; "tado" = ps: with ps; [ ]; # missing inputs: python-tado "tahoma" = ps: with ps; [ ]; # missing inputs: tahoma-api "tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility @@ -796,19 +796,19 @@ "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff "tautulli" = ps: with ps; [ ]; # missing inputs: pytautulli "tcp" = ps: with ps; [ ]; - "ted5000" = ps: with ps; [ xmltodict]; + "ted5000" = ps: with ps; [ xmltodict ]; "teksavvy" = ps: with ps; [ ]; - "telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot]; - "telegram_bot" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot]; + "telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ]; + "telegram_bot" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ]; "tellduslive" = ps: with ps; [ ]; # missing inputs: tellduslive "tellstick" = ps: with ps; [ ]; # missing inputs: tellcore-net tellcore-py "telnet" = ps: with ps; [ ]; "temper" = ps: with ps; [ ]; # missing inputs: temperusb "template" = ps: with ps; [ ]; - "tensorflow" = ps: with ps; [ numpy pillow protobuf]; # missing inputs: pycocotools tensorflow tf-models-official tf-slim + "tensorflow" = ps: with ps; [ numpy pillow protobuf ]; # missing inputs: pycocotools tensorflow tf-models-official tf-slim "tesla" = ps: with ps; [ ]; # missing inputs: teslajsonpy "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac - "thermoworks_smoke" = ps: with ps; [ stringcase]; # missing inputs: thermoworks_smoke + "thermoworks_smoke" = ps: with ps; [ stringcase ]; # missing inputs: thermoworks_smoke "thethingsnetwork" = ps: with ps; [ ]; "thingspeak" = ps: with ps; [ ]; # missing inputs: thingspeak "thinkingcleaner" = ps: with ps; [ ]; # missing inputs: pythinkingcleaner @@ -821,51 +821,51 @@ "timer" = ps: with ps; [ ]; "tmb" = ps: with ps; [ ]; # missing inputs: tmb "tod" = ps: with ps; [ ]; - "todoist" = ps: with ps; [ todoist]; + "todoist" = ps: with ps; [ todoist ]; "tof" = ps: with ps; [ ]; # missing inputs: RPi.GPIO VL53L1X2 "tomato" = ps: with ps; [ ]; - "toon" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: toonapi - "torque" = ps: with ps; [ aiohttp-cors]; + "toon" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: toonapi + "torque" = ps: with ps; [ aiohttp-cors ]; "totalconnect" = ps: with ps; [ ]; # missing inputs: total_connect_client "touchline" = ps: with ps; [ ]; # missing inputs: pytouchline - "tplink" = ps: with ps; [ pyhs100]; + "tplink" = ps: with ps; [ pyhs100 ]; "tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected - "traccar" = ps: with ps; [ aiohttp-cors stringcase]; # missing inputs: pytraccar + "traccar" = ps: with ps; [ aiohttp-cors stringcase ]; # missing inputs: pytraccar "trackr" = ps: with ps; [ ]; # missing inputs: pytrackr "tradfri" = ps: with ps; [ ]; # missing inputs: pytradfri[async] "trafikverket_train" = ps: with ps; [ ]; # missing inputs: pytrafikverket "trafikverket_weatherstation" = ps: with ps; [ ]; # missing inputs: pytrafikverket - "transmission" = ps: with ps; [ transmissionrpc]; + "transmission" = ps: with ps; [ transmissionrpc ]; "transport_nsw" = ps: with ps; [ ]; # missing inputs: PyTransportNSW "travisci" = ps: with ps; [ ]; # missing inputs: TravisPy - "trend" = ps: with ps; [ numpy]; - "tts" = ps: with ps; [ aiohttp-cors mutagen]; + "trend" = ps: with ps; [ numpy ]; + "tts" = ps: with ps; [ aiohttp-cors mutagen ]; "tuya" = ps: with ps; [ ]; # missing inputs: tuyaha "twentemilieu" = ps: with ps; [ ]; # missing inputs: twentemilieu - "twilio" = ps: with ps; [ aiohttp-cors twilio]; - "twilio_call" = ps: with ps; [ aiohttp-cors twilio]; - "twilio_sms" = ps: with ps; [ aiohttp-cors twilio]; + "twilio" = ps: with ps; [ aiohttp-cors twilio ]; + "twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; + "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; "twitch" = ps: with ps; [ ]; # missing inputs: python-twitch-client "twitter" = ps: with ps; [ ]; # missing inputs: TwitterAPI "ubee" = ps: with ps; [ ]; # missing inputs: pyubee "ubus" = ps: with ps; [ ]; "ue_smart_radio" = ps: with ps; [ ]; "uk_transport" = ps: with ps; [ ]; - "unifi" = ps: with ps; [ aiounifi]; - "unifi_direct" = ps: with ps; [ pexpect]; + "unifi" = ps: with ps; [ aiounifi ]; + "unifi_direct" = ps: with ps; [ pexpect ]; "unifiled" = ps: with ps; [ ]; # missing inputs: unifiled "universal" = ps: with ps; [ ]; "upb" = ps: with ps; [ ]; # missing inputs: upb_lib "upc_connect" = ps: with ps; [ ]; # missing inputs: connect-box "upcloud" = ps: with ps; [ ]; # missing inputs: upcloud-api - "updater" = ps: with ps; [ distro]; - "upnp" = ps: with ps; [ async-upnp-client]; + "updater" = ps: with ps; [ distro ]; + "upnp" = ps: with ps; [ async-upnp-client ]; "uptime" = ps: with ps; [ ]; "uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot "uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus "usgs_earthquakes_feed" = ps: with ps; [ ]; # missing inputs: geojson_client "utility_meter" = ps: with ps; [ ]; - "uvc" = ps: with ps; [ uvcclient]; + "uvc" = ps: with ps; [ uvcclient ]; "vacuum" = ps: with ps; [ ]; "vallox" = ps: with ps; [ ]; # missing inputs: vallox-websocket-api "vasttrafik" = ps: with ps; [ ]; # missing inputs: vtjp @@ -873,43 +873,43 @@ "velux" = ps: with ps; [ ]; # missing inputs: pyvlx "venstar" = ps: with ps; [ ]; # missing inputs: venstarcolortouch "vera" = ps: with ps; [ ]; # missing inputs: pyvera - "verisure" = ps: with ps; [ jsonpath]; # missing inputs: vsure + "verisure" = ps: with ps; [ jsonpath ]; # missing inputs: vsure "versasense" = ps: with ps; [ ]; # missing inputs: pyversasense - "version" = ps: with ps; [ pyhaversion]; + "version" = ps: with ps; [ pyhaversion ]; "vesync" = ps: with ps; [ ]; # missing inputs: pyvesync "viaggiatreno" = ps: with ps; [ ]; "vicare" = ps: with ps; [ ]; # missing inputs: PyViCare "vilfo" = ps: with ps; [ ]; # missing inputs: vilfo-api-client "vivotek" = ps: with ps; [ ]; # missing inputs: libpyvivotek "vizio" = ps: with ps; [ ]; # missing inputs: pyvizio - "vlc" = ps: with ps; [ python-vlc]; + "vlc" = ps: with ps; [ python-vlc ]; "vlc_telnet" = ps: with ps; [ ]; # missing inputs: python-telnet-vlc "voicerss" = ps: with ps; [ ]; "volkszaehler" = ps: with ps; [ ]; # missing inputs: volkszaehler "volumio" = ps: with ps; [ ]; # missing inputs: pyvolumio "volvooncall" = ps: with ps; [ ]; # missing inputs: volvooncall - "vultr" = ps: with ps; [ vultr]; + "vultr" = ps: with ps; [ vultr ]; "w800rf32" = ps: with ps; [ ]; # missing inputs: pyW800rf32 - "wake_on_lan" = ps: with ps; [ wakeonlan]; + "wake_on_lan" = ps: with ps; [ wakeonlan ]; "waqi" = ps: with ps; [ ]; # missing inputs: waqiasync "water_heater" = ps: with ps; [ ]; "waterfurnace" = ps: with ps; [ ]; # missing inputs: waterfurnace "watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf "watson_tts" = ps: with ps; [ ]; # missing inputs: ibm-watson - "waze_travel_time" = ps: with ps; [ WazeRouteCalculator]; + "waze_travel_time" = ps: with ps; [ WazeRouteCalculator ]; "weather" = ps: with ps; [ ]; - "webhook" = ps: with ps; [ aiohttp-cors]; + "webhook" = ps: with ps; [ aiohttp-cors ]; "webostv" = ps: with ps; [ ]; # missing inputs: aiopylgtv - "websocket_api" = ps: with ps; [ aiohttp-cors]; + "websocket_api" = ps: with ps; [ aiohttp-cors ]; "wemo" = ps: with ps; [ ]; # missing inputs: pywemo "whois" = ps: with ps; [ ]; # missing inputs: python-whois "wiffi" = ps: with ps; [ ]; # missing inputs: wiffi - "wink" = ps: with ps; [ aiohttp-cors]; # missing inputs: pubnubsub-handler python-wink + "wink" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pubnubsub-handler python-wink "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy - "withings" = ps: with ps; [ aiohttp-cors]; # missing inputs: withings-api + "withings" = ps: with ps; [ aiohttp-cors ]; # missing inputs: withings-api "wled" = ps: with ps; [ ]; # missing inputs: wled "wolflink" = ps: with ps; [ ]; # missing inputs: wolf_smartset - "workday" = ps: with ps; [ holidays]; + "workday" = ps: with ps; [ holidays ]; "worldclock" = ps: with ps; [ ]; "worldtidesinfo" = ps: with ps; [ ]; "worxlandroid" = ps: with ps; [ ]; @@ -920,33 +920,33 @@ "xbox_live" = ps: with ps; [ ]; # missing inputs: xboxapi "xeoma" = ps: with ps; [ ]; # missing inputs: pyxeoma "xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway - "xiaomi" = ps: with ps; [ ha-ffmpeg]; - "xiaomi_aqara" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: PyXiaomiGateway - "xiaomi_miio" = ps: with ps; [ construct python-miio]; + "xiaomi" = ps: with ps; [ ha-ffmpeg ]; + "xiaomi_aqara" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: PyXiaomiGateway + "xiaomi_miio" = ps: with ps; [ construct python-miio ]; "xiaomi_tv" = ps: with ps; [ ]; # missing inputs: pymitv - "xmpp" = ps: with ps; [ slixmpp]; + "xmpp" = ps: with ps; [ slixmpp ]; "xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client "yale_smart_alarm" = ps: with ps; [ ]; # missing inputs: yalesmartalarmclient - "yamaha" = ps: with ps; [ rxv]; + "yamaha" = ps: with ps; [ rxv ]; "yamaha_musiccast" = ps: with ps; [ ]; # missing inputs: pymusiccast "yandex_transport" = ps: with ps; [ ]; # missing inputs: aioymaps "yandextts" = ps: with ps; [ ]; - "yeelight" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: yeelight + "yeelight" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: yeelight "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower "yessssms" = ps: with ps; [ ]; # missing inputs: YesssSMS - "yi" = ps: with ps; [ aioftp ha-ffmpeg]; - "yr" = ps: with ps; [ xmltodict]; + "yi" = ps: with ps; [ aioftp ha-ffmpeg ]; + "yr" = ps: with ps; [ xmltodict ]; "zabbix" = ps: with ps; [ ]; # missing inputs: pyzabbix "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge - "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf]; + "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; "zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc - "zestimate" = ps: with ps; [ xmltodict]; - "zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy]; + "zestimate" = ps: with ps; [ xmltodict ]; + "zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy ]; "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl "zone" = ps: with ps; [ ]; - "zoneminder" = ps: with ps; [ zm-py]; - "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher]; + "zoneminder" = ps: with ps; [ zm-py ]; + "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ]; }; } diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 3301db1756f..8f4d65066d0 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -75,7 +75,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.114.3"; + hassVersion = "0.114.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -94,7 +94,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1fn93vac9vi1wcbq8z9pc2cdvfdkkxpam2qhv5ni14wrmnjc4305"; + sha256 = "0k9px4ny0b72d9ysr3x72idprgfgjab1z91ildr87629826bb4n7"; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 3c6d0c4bcab..4fa4b8a48ee 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -113,6 +113,10 @@ def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional # instead of python-3.6-python-mpd2 inside Nixpkgs if req.startswith("python-") or req.startswith("python_"): names.append(req[len("python-") :]) + # Add name variant without extra_require, e.g. samsungctl + # instead of samsungctl[websocket] + if req.endswith("]"): + names.append(req[:req.find("[")]) for name in names: # treat "-" and "_" equally name = re.sub("[-_]", "[-_]", name) @@ -173,9 +177,10 @@ def main() -> None: f.write(" components = {\n") for component, deps in build_inputs.items(): available, missing = deps - f.write(f' "{component}" = ps: with ps; [ ') - f.write(" ".join(available)) - f.write("];") + f.write(f' "{component}" = ps: with ps; [') + if available: + f.write(" " + " ".join(available)) + f.write(" ];") if len(missing) > 0: f.write(f" # missing inputs: {' '.join(missing)}") f.write("\n") diff --git a/pkgs/servers/irc/robustirc-bridge/default.nix b/pkgs/servers/irc/robustirc-bridge/default.nix new file mode 100644 index 00000000000..84b80203f57 --- /dev/null +++ b/pkgs/servers/irc/robustirc-bridge/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: + +buildGoModule rec { + pname = "robustirc-bridge"; + version = "1.8"; + + src = fetchFromGitHub { + owner = "robustirc"; + repo = "bridge"; + rev = "v${version}"; + sha256 = "12jzil97147f978shdgm6whz7699db0shh0c1fzgrjh512dw502c"; + }; + + vendorSha256 = "0lm8j2iz0yysgi0bbh78ca629kb6sxvyy9al3aj2587hpvy79q85"; + + postInstall = '' + install -D robustirc-bridge.1 $out/share/man/man1/robustirc-bridge.1 + ''; + + passthru.tests.robustirc-bridge = nixosTests.robustirc-bridge; + + meta = with stdenv.lib; { + description = "Bridge to robustirc.net-IRC-Network"; + homepage = "https://robustirc.net/"; + license = licenses.bsd3; + maintainers = [ maintainers.hax404 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index c470dcf1fd0..b41861768d8 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "VictoriaMetrics"; - version = "1.37.4"; + version = "1.40.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "02jr0qz130jz7ncfch1jry0prd00669j53mlmpb6ky0xiz5y2zq1"; + sha256 = "0dnzc7yrd91g67wkx0g1b0gi7918pi1hqv4mjlxi2ccs8phxkk7l"; }; goPackagePath = "github.com/VictoriaMetrics/VictoriaMetrics"; diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix index 5be4805909d..578d280afd9 100644 --- a/pkgs/servers/sslh/default.nix +++ b/pkgs/servers/sslh/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sslh"; - version = "1.21"; + version = "1.21c"; src = fetchurl { url = "https://www.rutschle.net/tech/sslh/sslh-v${version}.tar.gz"; - sha256 = "1am63nslvv9xkbn9xavpf1zl6f7g1snz8cvnzlya7dq4la4y97d7"; + sha256 = "01p7w74ppszxgz6n41lqd6xqvc7bjk2dsc769dd1yb7q4qvpiziv"; }; postPatch = "patchShebangs *.sh"; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 863dc505032..32c0c84dd08 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.0.3"; + version = "1.0.5"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "1m3cfq4qyg2l0hpk8s7nr8cw2j7akiga7x8bwyhdjifnkwsyz6x7"; + sha256 = "0ib2s694kf5iz5hvrlzfs80z0931dhva7yir80crq0pji9y4rp7b"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 5d6a8a6065b..f73ec422e06 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -4,21 +4,31 @@ , glibcLocales , coreutils , git +, fetchpatch }: python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.19"; + version = "0.9.20"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "1s7nb23zh4may4k3c9yfiizfdflm97hf5q2aww4j6ibykgcydv64"; + sha256 = "05phrwqd1c64531y78zxkxd4w1cli8yj3x2cqch7nkzbyz93608p"; }; LC_ALL = "en_US.UTF-8"; + + patches = [ + # Fix vox tests. Remove with the next release + (fetchpatch { + url = "https://github.com/xonsh/xonsh/commit/00aeb7645af97134495cc6bc5fe2f41922df8676.patch"; + sha256 = "0hx5jk22wxgmjzmqbxr2pjs3mwh7p0jwld0xhslc1s6whbjml25h"; + }) + ]; + postPatch = '' sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py sed -ie "s|SHELL=xonsh|SHELL=$out/bin/xonsh|" tests/test_integrations.py diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 2fce32e018e..33a32b48c30 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -1,70 +1,68 @@ # This script was inspired by the ArchLinux User Repository package: # # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2020-08-24"; + version = "2020-08-28"; pname = "oh-my-zsh"; - rev = "cfb86cd08d3b24fd4b59d0d35b3af1f589c891fa"; + rev = "4ed6fd2b8b6a0efb2f84f00a64503282aca260e7"; - src = fetchgit { inherit rev; - url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "0af37smv0bqw37bng2halzgszf8y3m2sxahdff54m16asm0py2cr"; + src = fetchFromGitHub { + inherit rev; + owner = "ohmyzsh"; + repo = "ohmyzsh"; + sha256 = "0f2f1k6s28lgxpjdgl4s7jisw6dgva9mcsqlsq0wg6041p246nai"; }; - pathsToLink = [ "/share/oh-my-zsh" ]; - - phases = "installPhase"; - installPhase = '' - outdir=$out/share/oh-my-zsh - template=templates/zshrc.zsh-template + outdir=$out/share/oh-my-zsh + template=templates/zshrc.zsh-template - mkdir -p $outdir - cp -r $src/* $outdir - cd $outdir + mkdir -p $outdir + cp -r * $outdir + cd $outdir - rm LICENSE.txt - rm -rf .git* + rm LICENSE.txt + rm -rf .git* - chmod -R +w templates + chmod -R +w templates - # Change the path to oh-my-zsh dir and disable auto-updating. - sed -i -e "s#ZSH=\$HOME/.oh-my-zsh#ZSH=$outdir#" \ - -e 's/\# \(DISABLE_AUTO_UPDATE="true"\)/\1/' \ - $template + # Change the path to oh-my-zsh dir and disable auto-updating. + sed -i -e "s#ZSH=\$HOME/.oh-my-zsh#ZSH=$outdir#" \ + -e 's/\# \(DISABLE_AUTO_UPDATE="true"\)/\1/' \ + $template - chmod +w oh-my-zsh.sh + chmod +w oh-my-zsh.sh - # Both functions expect oh-my-zsh to be in ~/.oh-my-zsh and try to - # modify the directory. - cat >> oh-my-zsh.sh <<- EOF + # Both functions expect oh-my-zsh to be in ~/.oh-my-zsh and try to + # modify the directory. + cat >> oh-my-zsh.sh <<- EOF - # Undefine functions that don't work on Nix. - unfunction uninstall_oh_my_zsh - unfunction upgrade_oh_my_zsh - EOF + # Undefine functions that don't work on Nix. + unfunction uninstall_oh_my_zsh + unfunction upgrade_oh_my_zsh + EOF - # Look for .zsh_variables, .zsh_aliases, and .zsh_funcs, and source - # them, if found. - cat >> $template <<- EOF + # Look for .zsh_variables, .zsh_aliases, and .zsh_funcs, and source + # them, if found. + cat >> $template <<- EOF - # Load the variables. - if [ -f ~/.zsh_variables ]; then - . ~/.zsh_variables - fi + # Load the variables. + if [ -f ~/.zsh_variables ]; then + . ~/.zsh_variables + fi - # Load the functions. - if [ -f ~/.zsh_funcs ]; then - . ~/.zsh_funcs - fi + # Load the functions. + if [ -f ~/.zsh_funcs ]; then + . ~/.zsh_funcs + fi - # Load the aliases. - if [ -f ~/.zsh_aliases ]; then - . ~/.zsh_aliases - fi - EOF + # Load the aliases. + if [ -f ~/.zsh_aliases ]; then + . ~/.zsh_aliases + fi + EOF ''; meta = with stdenv.lib; { diff --git a/pkgs/shells/zsh/oh-my-zsh/update.sh b/pkgs/shells/zsh/oh-my-zsh/update.sh index 0146cac8496..738c0810737 100755 --- a/pkgs/shells/zsh/oh-my-zsh/update.sh +++ b/pkgs/shells/zsh/oh-my-zsh/update.sh @@ -5,7 +5,6 @@ set -eu -o pipefail oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion oh-my-zsh" | tr -d '"')" latestSha="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits\?sha\=master\&since\=${oldVersion} | jq -r '.[0].sha')" -url="$(nix-instantiate --eval -E "with import ./. {}; oh-my-zsh.src.url" | tr -d '"')" if [ ! "null" = "${latestSha}" ]; then latestDate="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits/${latestSha} | jq '.commit.author.date' | sed 's|"\(.*\)T.*|\1|g')" diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 5b1c380548f..e0266aacf34 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -338,6 +338,32 @@ in rec { validity.handled ({ overrideAttrs = f: mkDerivation (attrs // (f attrs)); + + # A derivation that always builds successfully and whose runtime + # dependencies are the original derivations build time dependencies + # This allows easy building and distributing of all derivations + # needed to enter a nix-shell with + # nix-build shell.nix -A inputDerivation + inputDerivation = derivation (derivationArg // { + # Add a name in case the original drv didn't have one + name = derivationArg.name or "inputDerivation"; + # This always only has one output + outputs = [ "out" ]; + + # Propagate the original builder and arguments, since we override + # them and they might contain references to build inputs + _derivation_original_builder = derivationArg.builder; + _derivation_original_args = derivationArg.args; + + builder = stdenv.shell; + # The bash builtin `export` dumps all current environment variables, + # which is where all build input references end up (e.g. $PATH for + # binaries). By writing this to $out, Nix can find and register + # them as runtime dependencies (since Nix greps for store paths + # through $out to find them) + args = [ "-c" "export > $out" ]; + }); + inherit meta passthru; } // # Pass through extra attributes that are not inputs, but diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index 74a6777d949..91e067e7be7 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.195"; + version = "1.196"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "0d0xagigs5k3appzz5lzxdjncvnkgz4amz6ks7imiq8kkjixvmfy"; + sha256 = "0c79rycgpna8910as6blw3z3sajzzakz4qlvr6js2yr8zq2d0ylg"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 4517077ac46..4b2d88cdf27 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule, nixosTests }: buildGoModule rec { pname = "lego"; @@ -27,4 +27,6 @@ buildGoModule rec { homepage = "https://go-acme.github.io/lego/"; maintainers = teams.acme.members; }; + + passthru.tests.lego = nixosTests.acme; } diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 2e8ff96d41a..2a71556961e 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -18,13 +18,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.4"; + version = "4.5"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0fk42spz57nfmwy6xn02nnlkq01111x03psjq003k2785ah4xk1h"; + sha256 = "1nszzcyn8kvpnxppjbxky5x9a8n0jfmhy20j6nrwm3196gd6hirr"; }; postPatch = '' diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix index 86ef7f050b2..55dbba007f8 100644 --- a/pkgs/tools/audio/qastools/default.nix +++ b/pkgs/tools/audio/qastools/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "qastools"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitLab { owner = "sebholt"; repo = pname; rev = "v${version}"; - sha256 = "0px4fcn8dagivq5fyi5gy84yj86f6x0lk805mc4ry58d0wsbn68v"; + sha256 = "19hn64hnvryfmrkdg6rqyzahdbqf1s5y3dcca389jj6sdx93b3ip"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index a439bbf41b1..1f379feece4 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -1,18 +1,28 @@ -{ stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs, gpgme, xz }: +{ stdenv, fetchurl +, attr, e2fsprogs +, curl, librsync, libthreadar +, gpgme, libgcrypt, openssl +, bzip2, lzo, xz, zlib +}: with stdenv.lib; stdenv.mkDerivation rec { - version = "2.6.9"; + version = "2.6.10"; pname = "dar"; src = fetchurl { url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; - sha256 = "1jzqq54w1dix2qdlj4hr9dpq9fnp23h102bk8d2gq6k7n2zgaj6v"; + sha256 = "1ryj4xxar18hshg38j1ljhplypgmfprwqn72k1jwxi28qravg80n"; }; - buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] - ++ optionals stdenv.isLinux [ attr e2fsprogs ]; + outputs = [ "out" "dev" ]; + + buildInputs = [ + curl librsync libthreadar + gpgme libgcrypt openssl + bzip2 lzo xz zlib + ] ++ optionals stdenv.isLinux [ attr e2fsprogs ]; configureFlags = [ "--disable-birthtime" @@ -23,7 +33,8 @@ stdenv.mkDerivation rec { ]; postInstall = '' - rm -r "$out"/share/dar # Disable html help + # Disable html help + rm -r "$out"/share/dar ''; enableParallelBuilding = true; @@ -33,6 +44,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://dar.linux.free.fr"; description = "Disk ARchiver, allows backing up files into indexed archives"; + maintainers = with maintainers; [ izorkin ]; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/tools/compression/bzip2/1_1.nix b/pkgs/tools/compression/bzip2/1_1.nix new file mode 100644 index 00000000000..3f6105ca507 --- /dev/null +++ b/pkgs/tools/compression/bzip2/1_1.nix @@ -0,0 +1,45 @@ +{ stdenv +, fetchFromGitLab +, meson +, python3 +, ninja +}: + +stdenv.mkDerivation rec { + pname = "bzip2-unstable"; + version = "2020-08-11"; + + src = fetchFromGitLab { + owner = "federicomenaquintero"; + repo = "bzip2"; + rev = "15255b553e7c095fb7a26d4dc5819a11352ebba1"; + sha256 = "sha256-BAyz35D62LWi47B/gNcCSKpdaECHBGSpt21vtnk3fKs="; + }; + + postPatch = '' + patchShebangs install_links.py + ''; + + nativeBuildInputs = [ + meson + python3 + ninja + ]; + + outputs = [ "bin" "dev" "out" "man" ]; + + mesonFlags = [ + "-Ddocs=disabled" + ]; + + strictDeps = true; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "High-quality data compression program"; + license = licenses.bsdOriginal; + platforms = platforms.all; + maintainers = []; + }; +} diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index 896d472b832..158097d3812 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, libaal}: -let version = "2.0.0"; in +let version = "2.0.1"; in stdenv.mkDerivation rec { pname = "reiser4progs"; inherit version; src = fetchurl { url = "mirror://sourceforge/reiser4/reiser4-utils/${pname}-${version}.tar.gz"; - sha256 = "00kx9prz3d5plp1hn4xdkkd99cw42sanlsjnjhj0fsrlmi9yfs8n"; + sha256 = "1r7m95mnp6xmp1j5k99jhmz6g9y2qq7cghlmdxsfbr3xviqfs45d"; }; buildInputs = [libaal]; diff --git a/pkgs/tools/misc/bashcards/default.nix b/pkgs/tools/misc/bashcards/default.nix index ecaabb43c14..3e91b9741c6 100644 --- a/pkgs/tools/misc/bashcards/default.nix +++ b/pkgs/tools/misc/bashcards/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "bashcards"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "rpearce"; repo = pname; rev = "v${version}"; - sha256 = "1zbijbcm9lrqwiax37li0jjqcaxf469wh5d423frain56z1qknxl"; + sha256 = "1rpqrh0022sbrjvd55a0jvpdqhhka5msf8dsz6adbbmxy3xzgdid"; }; dontBuild = true; diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index 73dcbd3bc3c..415c55fb611 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "lsd"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "Peltoche"; repo = pname; rev = version; - sha256 = "1vyww54fl4yfvszr0dh8ym2jd9gilrccmwkvl7rbx70sfqzsgaai"; + sha256 = "006fy87jrb77cpa6bywchcvq1p74vlpy151q1j4nsj8npbr02krj"; }; - cargoSha256 = "13g0p6zh2b1z005lszll098d4lv62dzsxwhl76bianzrydif61lr"; + cargoSha256 = "0mrvcca9y0vylcrbfxxba45v05qxd8z91vb4in88px60xah0dy3q"; nativeBuildInputs = [ installShellFiles ]; postInstall = '' diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 8b1cb938fb7..d86f824b87f 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ openssl ]; + + # The mbuffer configure scripts fails to recognize the correct + # objdump binary during cross-building for foreign platforms. + # The correct objdump is exposed via the environment variable + # $OBJDUMP, which should be used in such cases. + preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + substituteInPlace configure --replace "OBJDUMP=$ac_cv_path_OBJDUMP" 'OBJDUMP=''${OBJDUMP}' + ''; doCheck = true; meta = { diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 568afb50403..fd1bfc7f8c7 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -39,13 +39,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2020.4"; + version = "2020.5"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "0s13cjrpx5r1dc9j9c9924zak45wl9nlbg9hiwgpsal80l92c39n"; + sha256 = "1k92177hjalbdpmg45ymwwrni68vh9rs5x9zvy5fzl9lng12fgpb"; }; patches = [ diff --git a/pkgs/tools/misc/somafm-cli/default.nix b/pkgs/tools/misc/somafm-cli/default.nix new file mode 100644 index 00000000000..312b402ae66 --- /dev/null +++ b/pkgs/tools/misc/somafm-cli/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, fetchFromGitHub +, makeWrapper +, curl +, jq +, mpv +}: + +stdenv.mkDerivation rec { + pname = "somafm-cli"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "rockymadden"; + repo = "somafm-cli"; + rev = "v${version}"; + sha256 = "1h5p9qsczgfr450sklh2vkllcpzb7nicbs8ciyvkavh3d7hds0yy"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -m0755 -D src/somafm $out/bin/somafm + wrapProgram $out/bin/somafm --prefix PATH ":" "${stdenv.lib.makeBinPath [ curl jq mpv ]}"; + ''; + + meta = with stdenv.lib; { + description = "Listen to SomaFM in your terminal via pure bash"; + homepage = "https://github.com/rockymadden/somafm-cli"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index 8ebbe75d686..01454b48254 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -20,11 +20,11 @@ let inherit (stdenv) lib; in stdenv.mkDerivation rec { pname = "yubikey-manager-qt"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "0rbr72741q7fqkr9qmvgj2mi6192ayz7bl935q2bsnqils4wsa3f"; + sha256 = "1yimlaqvhq34gw6wkqgil0qq8x9zbfzh4psqihjr2d9jaa2wygwy"; }; nativeBuildInputs = [ wrapQtAppsHook python3.pkgs.wrapPython qmake ]; diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index b690b63ef4b..d3aa432a45e 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.8.2"; + version = "3.10.1"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "0hm5h8glva0d9mj870j56bc721w4br7dzwhns096rgzyv93m7rx0"; + sha256 = "1djkryx8bz2rg0iqqb30jb122ydiyli2i9xsvcdmd42c47hxg46y"; }; - vendorSha256 = "1g3jbdx7m5m56ifcc1p6hgz2wzmb287cyyaiz03ffdvwd3k73k4j"; + vendorSha256 = "0c3hyvy8s470zvrv49fx0iil59z0xq10dw4vnr55qgbm2k2pay6w"; doCheck = false; diff --git a/pkgs/tools/networking/toss/default.nix b/pkgs/tools/networking/toss/default.nix new file mode 100644 index 00000000000..9752dcc4f64 --- /dev/null +++ b/pkgs/tools/networking/toss/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "toss"; + version = "1.1"; + src = fetchFromGitHub { + owner = "zerotier"; + repo = pname; + rev = version; + sha256 = "05ql0d8wbdhnmh3dw8ch5bi6clfb9h8v21lq2a74iy02slya2y0r"; + }; + preInstall = "export DESTDIR=$out/bin"; + meta = with stdenv.lib; + src.meta // { + description = "Dead simple LAN file transfers from the command line"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ ehmry ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index c3e4c637109..a9f0d7e77d6 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "1.0.20200820"; + version = "1.0.20200827"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"; - sha256 = "138pf23x39xm68pa4ks3g76axphl8pz5jw4fyi54wi7rvxclybc7"; + sha256 = "1d8rs1g6zy3kz327cc3hzkk5a44278x9p32gxasz6i94bq0b2bs3"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/tools/networking/zssh/default.nix index 720c43ccc2d..945c96ae851 100644 --- a/pkgs/tools/networking/zssh/default.nix +++ b/pkgs/tools/networking/zssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline, deepin }: +{ stdenv, fetchurl, readline }: let version = "1.5c"; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { description = "SSH and Telnet client with ZMODEM file transfer capability"; homepage = "http://zssh.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; - maintainers = deepin.deepin-terminal.meta.maintainers; # required by deepin-terminal + maintainers = [ ]; # required by deepin-terminal platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 39b34bf153d..0e2cec68520 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - version = "1.12.0"; + version = "1.12.1"; pname = "librepo"; outputs = [ "out" "dev" "py" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "rpm-software-management"; repo = "librepo"; rev = version; - sha256 = "070zgay0cbw6jrkcfp4qql9f9ydd41ilwk39xdrp939b23gp112d"; + sha256 = "0793j35fcv6bbz2pkd5rcsmx37hb1f0y48r4758cbfnl9rbp9y4z"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix new file mode 100644 index 00000000000..0ef3602c597 --- /dev/null +++ b/pkgs/tools/package-management/nix-template/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "nix-template"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "jonringer"; + repo = pname; + rev = "v${version}"; + sha256 = "1h6xdvhzg7nb0s82b3r5bsh8bfdb1l5sm7fa24lfwd396xp9yyig"; + }; + + cargoSha256 = "13y3b60xnry71999kygvkr29gkyjss3ga3rzb43ajah4qp90rsqs"; + + meta = with lib; { + description = "Make creating nix expressions easy"; + homepage = "https://github.com/jonringer/nix-template/"; + changelog = "https://github.com/jonringer/nix-template/releases/tag/v${version}"; + license = licenses.cc0; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 05036770316..2acf5d194e0 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -195,14 +195,14 @@ in rec { }); nixUnstable = lib.lowPrio (callPackage common rec { - name = "nix-2.4${suffix}"; - suffix = "pre20200721_ff314f1"; + name = "nix-3.0${suffix}"; + suffix = "pre20200829_f156513"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "ff314f186e3f91d87af6ad96c0ae3b472494b940"; - hash = "sha256-QibpLo4/gf2xYGoeQcgjZzH/qy5TBRVH+QCHgqOwur0="; + rev = "f15651303f8596bf34c67fc8d536b1e9e7843a87"; + hash = "sha256-HqM3Z4DLdMrf+0PPZL9ysctGg+K+i3S/IHA1GsJj0Ro="; }; inherit storeDir stateDir confDir boehmgc; diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index 922546009fc..935f6553f9c 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - sha256 = "1v988jsxx2r82q6mf3503130cny088hin2as00yi26jzxjkrjcli"; + sha256 = "0kca4442mla8j9980gi8kgp0vgm0f15hcjd0w0wdj8rlmkx9yf2l"; }; makeWrapperArgs = [ diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix index 14f2059cf5c..191b4f35150 100644 --- a/pkgs/tools/security/kbs2/default.nix +++ b/pkgs/tools/security/kbs2/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kbs2"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "woodruffw"; repo = pname; rev = "v${version}"; - sha256 = "1zp4gpbqhivmp7lpm10xb6ahx1z7nsijz7pi5i0bndv0y9mr609p"; + sha256 = "1hjcx651nqj1plxw4i2nv72zc0igd8pl31dy2zwm5yyky6dl7qla"; }; - cargoSha256 = "1inqz4whqw9mb3m22kv44f255m3cjr66pc5ncdw2rgpy3zjh4p3z"; + cargoSha256 = "11fw097r4mim3rgb0db7naqlf3ws0bavqdd4z84mpdg6714dga0n"; nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; @@ -27,6 +27,8 @@ rustPlatform.buildRustPackage rec { checkFlagsArray = [ "--skip=kbs2::config::tests::test_find_config_dir" ]; postInstall = '' + mkdir -p $out/share/kbs2 + cp -r contrib/ $out/share/kbs2 for shell in bash fish zsh; do $out/bin/kbs2 --completions $shell > kbs2.$shell installShellCompletion kbs2.$shell diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 940e67013ee..fc52662e536 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.26.2"; + version = "2.27.0"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "0y5gvdrdr6i9spdwsxvzs1bxs32icxpkqxnglp1bf4gglc580d87"; + sha256 = "15ddzab93iqwbvxnaw5wp4dzwlxjqxvyy1c4w37jm69zkczylrmc"; }; runVend = true; - vendorSha256 = "1kzihyx44sx6php4z58fzy6c3g0y713939yzxpgk3n03snn2x8sf"; + vendorSha256 = "1w7vnpv36lhxpaljdhslbckkr7p81nzc91a0503wk8nrrc4ljsyy"; doCheck = false; diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/tools/security/sshguard/default.nix index bad1c9fd16d..6c2298f6729 100644 --- a/pkgs/tools/security/sshguard/default.nix +++ b/pkgs/tools/security/sshguard/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, autoreconfHook, yacc, flex}: stdenv.mkDerivation rec { - version = "2.4.0"; + version = "2.4.1"; pname = "sshguard"; src = fetchurl { url = "mirror://sourceforge/sshguard/${pname}-${version}.tar.gz"; - sha256 = "1h6n2xyh58bshplbdqlr9rbnf3lz7nydnq5m2hkq15is3c4s8p06"; + sha256 = "0rrwmx91ifvc61wkld8gjkmfsq0ixxmf7m8fg4addkkxwvk04pc7"; }; doCheck = true; diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index e95dece2c96..2d86894808c 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -1,5 +1,7 @@ -{ lib, fetchFromGitHub, stdenv, autoreconfHook, ncurses, -IOKit, python3 }: +{ lib, fetchFromGitHub, stdenv, autoreconfHook +, ncurses, IOKit, python3 +, fetchpatch +}: stdenv.mkDerivation rec { pname = "htop"; @@ -12,10 +14,19 @@ stdenv.mkDerivation rec { sha256 = "096gdnpaszs5rfp7qj8npi2jkvdqpp8mznn89f97ykrg6pgagwq4"; }; + patches = [ + # Never use glyphs for checkmarks. Issue - https://github.com/htop-dev/htop/issues/29 + # Remove with the next release. + (fetchpatch { + url = "https://github.com/htop-dev/htop/commit/96074058278829facb86f6f4de099d56a00a0c0e.patch"; + sha256 = "1rnfvjfsvfgr1s7kzr1hk6nwik6shcq4mg6dlbgdq0f2fz0cnazk"; + }) + ]; + nativeBuildInputs = [ autoreconfHook python3 ]; - buildInputs = - [ ncurses ] ++ - lib.optionals stdenv.isDarwin [ IOKit ]; + + buildInputs = [ ncurses + ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; meta = with stdenv.lib; { description = "An interactive process viewer for Linux"; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index d9953b7cdb5..9939f9ea154 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.11.14"; + version = "0.11.19"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0sqka2ns9xqma9wa67in4vrd15q0rz62gblmzniq5i4xppykc55j"; + sha256 = "0s08qahjc68h5qhnahmb9z19l51p5sw2pmzrlknq1j5900zpa2x5"; }; postPatch = '' diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index aa7a8598d66..017066a2c22 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.7.3"; + version = "0.7.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "14mx22aqr9cmin4cyhrclhm0hly1i21j2dmsikfp1c87wl2kpn9xgxnix5r0iqh5dwjxdh591rfh21xjp0l11m0nl5wkpnn7wmq7g6b"; + sha512 = "2iw5x3lf5knnscp0ifgk50yj48p54cbd34h94qrxa9vdybg2nnipklrqmmqblf6l7qph98h7jvlyr99m5qlrki9lvjr1jcgbgp31pn0"; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b020d6fac55..da3d3bdfc6d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -456,6 +456,7 @@ mapAliases ({ phonon = throw "Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 quake3game = ioquake3; # added 2016-01-14 + qvim = throw "qvim has been removed."; # added 2020-08-31 qwt6 = libsForQt5.qwt; # added 2015-12-19 qtpfsgui = throw "Is now luminanceHDR"; # added 2019-06-26 quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 140cceed93f..121abc8275f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -985,6 +985,10 @@ in dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { }; + dot-http = callPackage ../development/tools/dot-http { + inherit (darwin.apple_sdk.frameworks) Security; + }; + doona = callPackage ../tools/security/doona { }; ecdsautils = callPackage ../tools/security/ecdsautils { }; @@ -2237,6 +2241,8 @@ in nix-direnv = callPackage ../tools/misc/nix-direnv { }; + nix-template = callPackage ../tools/package-management/nix-template { }; + nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; noteshrink = callPackage ../tools/misc/noteshrink { }; @@ -2573,6 +2579,8 @@ in bzip2 = callPackage ../tools/compression/bzip2 { }; + bzip2_1_1 = callPackage ../tools/compression/bzip2/1_1.nix { }; + cabextract = callPackage ../tools/archivers/cabextract { }; cadaver = callPackage ../tools/networking/cadaver { @@ -6988,6 +6996,10 @@ in snort = callPackage ../applications/networking/ids/snort { }; + so = callPackage ../development/tools/so { + inherit (darwin.apple_sdk.frameworks) Security; + }; + soapui = callPackage ../applications/networking/soapui { }; sshguard = callPackage ../tools/security/sshguard {}; @@ -7384,6 +7396,8 @@ in torsocks = callPackage ../tools/security/tor/torsocks.nix { }; + toss = callPackage ../tools/networking/toss { }; + tox-node = callPackage ../tools/networking/tox-node { }; toxvpn = callPackage ../tools/networking/toxvpn { }; @@ -13970,6 +13984,8 @@ in libtheora = callPackage ../development/libraries/libtheora { }; + libthreadar = callPackage ../development/libraries/libthreadar { }; + libtiff = callPackage ../development/libraries/libtiff { }; libtiger = callPackage ../development/libraries/libtiger { }; @@ -15667,7 +15683,6 @@ in webkitgtk = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; - stdenv = clangStdenv; # TODO: https://github.com/NixOS/nixpkgs/issues/36947 }; websocketpp = callPackage ../development/libraries/websocket++ { }; @@ -17650,8 +17665,6 @@ in ddcci-driver = callPackage ../os-specific/linux/ddcci { }; - deepin-anything = callPackage ../os-specific/linux/deepin-anything { }; - digimend = callPackage ../os-specific/linux/digimend { }; dpdk = callPackage ../os-specific/linux/dpdk { }; @@ -19261,6 +19274,8 @@ in vegeta = callPackage ../tools/networking/vegeta { }; + venta = callPackage ../data/themes/venta { }; + victor-mono = callPackage ../data/fonts/victor-mono { }; vimix-gtk-themes = callPackage ../data/themes/vimix {}; @@ -20738,6 +20753,8 @@ in gollum = callPackage ../applications/misc/gollum { }; + gonic = callPackage ../servers/gonic { }; + googleearth = callPackage ../applications/misc/googleearth { }; google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; }; @@ -21925,8 +21942,6 @@ in neocomp = callPackage ../applications/window-managers/neocomp { }; - netease-cloud-music = callPackage ../applications/audio/netease-cloud-music {}; - newsflash = callPackage ../applications/networking/feedreaders/newsflash { }; nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { @@ -23004,6 +23019,8 @@ in prusa-slicer = callPackage ../applications/misc/prusa-slicer { }; + robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; + sddm = libsForQt5.callPackage ../applications/display-managers/sddm { }; skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; @@ -23490,12 +23507,6 @@ in inherit (xorg) libxcb; }; - qvim = lowPrio (callPackage ../applications/editors/vim/qvim.nix { - features = "huge"; # one of tiny, small, normal, big or huge - lua = pkgs.lua5; - flags = [ "python" "X11" ]; # only flag "X11" by now - }); - vimpc = callPackage ../applications/audio/vimpc { }; wrapNeovim = callPackage ../applications/editors/neovim/wrapper.nix { }; @@ -25339,11 +25350,6 @@ in cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { }); - deepin = recurseIntoAttrs (import ../desktops/deepin { - inherit pkgs libsForQt5; - inherit (lib) makeScope; - }); - enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { callPackage = newScope pkgs.enlightenment; }); @@ -25670,6 +25676,8 @@ in snpeff = callPackage ../applications/science/biology/snpeff { }; + somafm-cli = callPackage ../tools/misc/somafm-cli/default.nix { }; + somatic-sniper = callPackage ../applications/science/biology/somatic-sniper { }; sortmerna = callPackage ../applications/science/biology/sortmerna { }; @@ -26680,11 +26688,11 @@ in # Exceptions are versions that we need to keep to allow upgrades from older NixOS releases inherit (callPackage ../applications/networking/cluster/kops {}) mkKops - kops_1_15 kops_1_16 kops_1_17 + kops_1_18 ; - kops = kops_1_17; + kops = kops_1_18; lguf-brightness = callPackage ../misc/lguf-brightness { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ba02c3bb524..32bb7d33786 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -754,6 +754,12 @@ let piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; + posix-base = callPackage ../development/ocaml-modules/posix/base.nix { }; + + posix-socket = callPackage ../development/ocaml-modules/posix/socket.nix { }; + + posix-types = callPackage ../development/ocaml-modules/posix/types.nix { }; + ppxfind = callPackage ../development/ocaml-modules/ppxfind { }; ppxlib = callPackage ../development/ocaml-modules/ppxlib { }; @@ -955,6 +961,8 @@ let wasm = callPackage ../development/ocaml-modules/wasm { }; + webbrowser = callPackage ../development/ocaml-modules/webbrowser { }; + webmachine = callPackage ../development/ocaml-modules/webmachine { }; wtf8 = callPackage ../development/ocaml-modules/wtf8 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 286ac476fb4..611717b60f5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -142,118 +142,317 @@ in { else callPackage ../development/python-modules/setuptools { }; - vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { }; - - acoustics = callPackage ../development/python-modules/acoustics { }; - - py3to2 = callPackage ../development/python-modules/3to2 { }; - - pynamodb = callPackage ../development/python-modules/pynamodb { }; - aadict = callPackage ../development/python-modules/aadict { }; + aafigure = callPackage ../development/python-modules/aafigure { }; + absl-py = callPackage ../development/python-modules/absl-py { }; + accupy = callPackage ../development/python-modules/accupy { }; + + acme = callPackage ../development/python-modules/acme { }; + + acme-tiny = callPackage ../development/python-modules/acme-tiny { }; + + acoustics = callPackage ../development/python-modules/acoustics { }; + + actdiag = callPackage ../development/python-modules/actdiag { }; + + adal = callPackage ../development/python-modules/adal { }; + adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { }; + addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; + aenum = callPackage ../development/python-modules/aenum { }; + afdko = callPackage ../development/python-modules/afdko { }; + + affine = callPackage ../development/python-modules/affine { }; + affinity = callPackage ../development/python-modules/affinity { }; agate = callPackage ../development/python-modules/agate { }; agate-dbf = callPackage ../development/python-modules/agate-dbf { }; - alerta = callPackage ../development/python-modules/alerta { }; - - alerta-server = callPackage ../development/python-modules/alerta-server { }; - - androguard = callPackage ../development/python-modules/androguard { }; - - phonenumbers = callPackage ../development/python-modules/phonenumbers { }; - agate-excel = callPackage ../development/python-modules/agate-excel { }; agate-sql = callPackage ../development/python-modules/agate-sql { }; + aioamqp = callPackage ../development/python-modules/aioamqp { }; + + aioconsole = callPackage ../development/python-modules/aioconsole { }; + + aiocontextvars = callPackage ../development/python-modules/aiocontextvars { }; + + aiodns = callPackage ../development/python-modules/aiodns { }; + + aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { }; + + aioeventlet = callPackage ../development/python-modules/aioeventlet { }; + + aiofiles = callPackage ../development/python-modules/aiofiles { }; + + aioftp = callPackage ../development/python-modules/aioftp { }; + + aioh2 = callPackage ../development/python-modules/aioh2 { }; + + aioharmony = callPackage ../development/python-modules/aioharmony { }; + + aiohttp = callPackage ../development/python-modules/aiohttp { }; + + aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; + + aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; + + aiohttp-remotes = callPackage ../development/python-modules/aiohttp-remotes { }; + + aiohttp-socks = callPackage ../development/python-modules/aiohttp-socks { }; + + aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { }; + + aiohue = callPackage ../development/python-modules/aiohue { }; + aioimaplib = callPackage ../development/python-modules/aioimaplib { }; + aiojobs = callPackage ../development/python-modules/aiojobs { }; + + aiokafka = callPackage ../development/python-modules/aiokafka { }; + aiolifx = callPackage ../development/python-modules/aiolifx { }; aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { }; - aioamqp = callPackage ../development/python-modules/aioamqp { }; + aiomysql = callPackage ../development/python-modules/aiomysql { }; - aiojobs = callPackage ../development/python-modules/aiojobs { }; + aioprocessing = callPackage ../development/python-modules/aioprocessing { }; aioredis = callPackage ../development/python-modules/aioredis { }; + aioresponses = callPackage ../development/python-modules/aioresponses { }; + + aiorpcx = callPackage ../development/python-modules/aiorpcx { }; + aiorun = callPackage ../development/python-modules/aiorun { }; - ansicolor = callPackage ../development/python-modules/ansicolor { }; + aiosmtpd = callPackage ../development/python-modules/aiosmtpd { }; - ansiwrap = callPackage ../development/python-modules/ansiwrap { }; + aiosqlite = callPackage ../development/python-modules/aiosqlite { }; + + aiounifi = callPackage ../development/python-modules/aiounifi { }; + + aiounittest = callPackage ../development/python-modules/aiounittest { }; + + aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; + + ajpy = callPackage ../development/python-modules/ajpy { }; + + alabaster = callPackage ../development/python-modules/alabaster { }; + + alarmdecoder = callPackage ../development/python-modules/alarmdecoder { }; + + alembic = callPackage ../development/python-modules/alembic { }; + + alerta = callPackage ../development/python-modules/alerta { }; + + alerta-server = callPackage ../development/python-modules/alerta-server { }; + + algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { }; + + allpairspy = callPackage ../development/python-modules/allpairspy { }; + + alot = callPackage ../development/python-modules/alot { }; + + altair = callPackage ../development/python-modules/altair { }; + + amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; + + amqp = callPackage ../development/python-modules/amqp { }; + + amqplib = callPackage ../development/python-modules/amqplib { }; + + androguard = callPackage ../development/python-modules/androguard { }; + + aniso8601 = callPackage ../development/python-modules/aniso8601 { }; + + annexremote = callPackage ../development/python-modules/annexremote { }; + + annoy = callPackage ../development/python-modules/annoy { }; + + anonip = callPackage ../development/python-modules/anonip { }; ansi2html = callPackage ../development/python-modules/ansi2html { }; - anytree = callPackage ../development/python-modules/anytree { - inherit (pkgs) graphviz; - }; + ansible = callPackage ../development/python-modules/ansible { }; + + ansible-kernel = callPackage ../development/python-modules/ansible-kernel { }; + + ansible-lint = callPackage ../development/python-modules/ansible-lint { }; + + ansible-runner = callPackage ../development/python-modules/ansible-runner { }; + + ansi = callPackage ../development/python-modules/ansi { }; + + ansicolor = callPackage ../development/python-modules/ansicolor { }; + + ansicolors = callPackage ../development/python-modules/ansicolors { }; + + ansiconv = callPackage ../development/python-modules/ansiconv { }; + + ansiwrap = callPackage ../development/python-modules/ansiwrap { }; + + antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime { antlr4 = pkgs.antlr4; }; + + antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { antlr4 = pkgs.antlr4; }; + + anyjson = callPackage ../development/python-modules/anyjson { }; + + anytree = callPackage ../development/python-modules/anytree { inherit (pkgs) graphviz; }; + + apache-airflow = callPackage ../development/python-modules/apache-airflow { }; + + apipkg = callPackage ../development/python-modules/apipkg { }; + + apispec = callPackage ../development/python-modules/apispec { }; aplpy = callPackage ../development/python-modules/aplpy { }; + appdirs = callPackage ../development/python-modules/appdirs { }; + + appleseed = disabledIf isPy3k (toPythonModule (pkgs.appleseed.override { inherit (self) python; })); + + application = callPackage ../development/python-modules/application { }; + + applicationinsights = callPackage ../development/python-modules/applicationinsights { }; + + appnope = callPackage ../development/python-modules/appnope { }; + apprise = callPackage ../development/python-modules/apprise { }; - arrayqueues = callPackage ../development/python-modules/arrayqueues { }; + approvaltests = callPackage ../development/python-modules/approvaltests { }; + + apptools = callPackage ../development/python-modules/apptools { }; + + APScheduler = callPackage ../development/python-modules/APScheduler { }; + + apsw = callPackage ../development/python-modules/apsw { }; + + area = callPackage ../development/python-modules/area { }; + + arelle = callPackage ../development/python-modules/arelle { gui = true; }; + + arelle-headless = callPackage ../development/python-modules/arelle { gui = false; }; aresponses = callPackage ../development/python-modules/aresponses { }; + argcomplete = callPackage ../development/python-modules/argcomplete { }; + + argh = callPackage ../development/python-modules/argh { }; + argon2_cffi = callPackage ../development/python-modules/argon2_cffi { }; + args = callPackage ../development/python-modules/args { }; + aria2p = callPackage ../development/python-modules/aria2p { inherit (pkgs) aria2; }; + arrayqueues = callPackage ../development/python-modules/arrayqueues { }; + + arrow = callPackage ../development/python-modules/arrow { }; + arviz = callPackage ../development/python-modules/arviz { }; - asana = callPackage ../development/python-modules/asana { }; + arxiv2bib = callPackage ../development/python-modules/arxiv2bib { }; - asdf = callPackage ../development/python-modules/asdf { }; + asana = callPackage ../development/python-modules/asana { }; asciimatics = callPackage ../development/python-modules/asciimatics { }; asciitree = callPackage ../development/python-modules/asciitree { }; + asdf = callPackage ../development/python-modules/asdf { }; + ase = if isPy27 then - callPackage ../development/python-modules/ase/3.17.nix { } - else - callPackage ../development/python-modules/ase { }; + callPackage ../development/python-modules/ase/3.17.nix { } + else + callPackage ../development/python-modules/ase { }; + + asgiref = callPackage ../development/python-modules/asgiref { }; + + asn1ate = callPackage ../development/python-modules/asn1ate { }; asn1crypto = callPackage ../development/python-modules/asn1crypto { }; aspy-yaml = callPackage ../development/python-modules/aspy.yaml { }; + astor = callPackage ../development/python-modules/astor { }; + astral = callPackage ../development/python-modules/astral { }; + astroid = if isPy3k then + callPackage ../development/python-modules/astroid { } + else + callPackage ../development/python-modules/astroid/1.6.nix { }; + astropy = callPackage ../development/python-modules/astropy { }; - astropy-helpers = callPackage ../development/python-modules/astropy-helpers { }; - astropy-healpix = callPackage ../development/python-modules/astropy-healpix { }; + astropy-helpers = callPackage ../development/python-modules/astropy-helpers { }; + astroquery = callPackage ../development/python-modules/astroquery { }; asttokens = callPackage ../development/python-modules/asttokens { }; + astunparse = callPackage ../development/python-modules/astunparse { }; + + async_generator = callPackage ../development/python-modules/async_generator { }; + + asyncpg = callPackage ../development/python-modules/asyncpg { }; + + asyncssh = callPackage ../development/python-modules/asyncssh { }; + + asynctest = callPackage ../development/python-modules/asynctest { }; + + async-timeout = callPackage ../development/python-modules/async_timeout { }; + + async-upnp-client = callPackage ../development/python-modules/async-upnp-client { }; + + atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { }; + atom = callPackage ../development/python-modules/atom { }; - augeas = callPackage ../development/python-modules/augeas { - inherit (pkgs) augeas; - }; + atomiclong = callPackage ../development/python-modules/atomiclong { }; + + atomicwrites = callPackage ../development/python-modules/atomicwrites { }; + + atomman = callPackage ../development/python-modules/atomman { }; + + atpublic = callPackage ../development/python-modules/atpublic { }; + + atsim_potentials = callPackage ../development/python-modules/atsim_potentials { }; + + attrdict = callPackage ../development/python-modules/attrdict { }; + + attrs = callPackage ../development/python-modules/attrs { }; + + audio-metadata = callPackage ../development/python-modules/audio-metadata { }; + + audioread = callPackage ../development/python-modules/audioread { }; + + audiotools = callPackage ../development/python-modules/audiotools { }; + + augeas = callPackage ../development/python-modules/augeas { inherit (pkgs) augeas; }; + + auth0-python = callPackage ../development/python-modules/auth0-python { }; authheaders = callPackage ../development/python-modules/authheaders { }; + authlib = callPackage ../development/python-modules/authlib { }; + authres = callPackage ../development/python-modules/authres { }; - auth0-python = callPackage ../development/python-modules/auth0-python { }; + autobahn = callPackage ../development/python-modules/autobahn { }; autograd = callPackage ../development/python-modules/autograd { }; @@ -261,42 +460,44 @@ in { automat = callPackage ../development/python-modules/automat { }; - awkward = callPackage ../development/python-modules/awkward { }; - awkward1 = callPackage ../development/python-modules/awkward1 { }; - - aws-sam-translator = callPackage ../development/python-modules/aws-sam-translator { }; - - aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; - - aws-adfs = callPackage ../development/python-modules/aws-adfs { }; - - atomman = callPackage ../development/python-modules/atomman { }; - - authlib = callPackage ../development/python-modules/authlib { }; - - # packages defined elsewhere - - amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; - - ansiconv = callPackage ../development/python-modules/ansiconv { }; + autopep8 = callPackage ../development/python-modules/autopep8 { }; avahi = toPythonModule (pkgs.avahi.override { inherit python; withPython = true; }); - azure-nspkg = callPackage ../development/python-modules/azure-nspkg { }; + av = callPackage ../development/python-modules/av { inherit (pkgs) pkgconfig; }; - azure-common = callPackage ../development/python-modules/azure-common { }; + avro3k = callPackage ../development/python-modules/avro3k { }; - azure-cosmos = callPackage ../development/python-modules/azure-cosmos { }; + avro = callPackage ../development/python-modules/avro { }; + + avro-python3 = callPackage ../development/python-modules/avro-python3 { }; + + awesome-slugify = callPackage ../development/python-modules/awesome-slugify { }; + + awkward = callPackage ../development/python-modules/awkward { }; + awkward1 = callPackage ../development/python-modules/awkward1 { }; + + aws-adfs = callPackage ../development/python-modules/aws-adfs { }; + + aws-lambda-builders = callPackage ../development/python-modules/aws-lambda-builders { }; + + aws-sam-translator = callPackage ../development/python-modules/aws-sam-translator { }; + + aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; azure-applicationinsights = callPackage ../development/python-modules/azure-applicationinsights { }; azure-batch = callPackage ../development/python-modules/azure-batch { }; + azure-common = callPackage ../development/python-modules/azure-common { }; + azure-core = callPackage ../development/python-modules/azure-core { }; + azure-cosmos = callPackage ../development/python-modules/azure-cosmos { }; + azure-cosmosdb-nspkg = callPackage ../development/python-modules/azure-cosmosdb-nspkg { }; azure-cosmosdb-table = callPackage ../development/python-modules/azure-cosmosdb-table { }; @@ -323,30 +524,6 @@ in { azure-loganalytics = callPackage ../development/python-modules/azure-loganalytics { }; - azure-servicebus = callPackage ../development/python-modules/azure-servicebus { }; - - azure-servicefabric = callPackage ../development/python-modules/azure-servicefabric { }; - - azure-servicemanagement-legacy = callPackage ../development/python-modules/azure-servicemanagement-legacy { }; - - azure-storage-nspkg = callPackage ../development/python-modules/azure-storage-nspkg { }; - - azure-storage-common = callPackage ../development/python-modules/azure-storage-common { }; - - azure-storage = callPackage ../development/python-modules/azure-storage { }; - - azure-storage-blob = callPackage ../development/python-modules/azure-storage-blob { }; - - azure-storage-file = callPackage ../development/python-modules/azure-storage-file { }; - - azure-storage-file-share = callPackage ../development/python-modules/azure-storage-file-share { }; - - azure-storage-queue = callPackage ../development/python-modules/azure-storage-queue { }; - - azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; - - azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; - azure-mgmt-advisor = callPackage ../development/python-modules/azure-mgmt-advisor { }; azure-mgmt-apimanagement = callPackage ../development/python-modules/azure-mgmt-apimanagement { }; @@ -357,10 +534,10 @@ in { azure-mgmt-authorization = callPackage ../development/python-modules/azure-mgmt-authorization { }; - azure-mgmt-batch = callPackage ../development/python-modules/azure-mgmt-batch { }; - azure-mgmt-batchai = callPackage ../development/python-modules/azure-mgmt-batchai { }; + azure-mgmt-batch = callPackage ../development/python-modules/azure-mgmt-batch { }; + azure-mgmt-billing = callPackage ../development/python-modules/azure-mgmt-billing { }; azure-mgmt-botservice = callPackage ../development/python-modules/azure-mgmt-botservice { }; @@ -371,6 +548,8 @@ in { azure-mgmt-commerce = callPackage ../development/python-modules/azure-mgmt-commerce { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; + azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; azure-mgmt-consumption = callPackage ../development/python-modules/azure-mgmt-consumption { }; @@ -395,12 +574,12 @@ in { azure-mgmt-datamigration = callPackage ../development/python-modules/azure-mgmt-datamigration { }; + azure-mgmt-deploymentmanager = callPackage ../development/python-modules/azure-mgmt-deploymentmanager { }; + azure-mgmt-devspaces = callPackage ../development/python-modules/azure-mgmt-devspaces { }; azure-mgmt-devtestlabs = callPackage ../development/python-modules/azure-mgmt-devtestlabs { }; - azure-mgmt-deploymentmanager = callPackage ../development/python-modules/azure-mgmt-deploymentmanager { }; - azure-mgmt-dns = callPackage ../development/python-modules/azure-mgmt-dns { }; azure-mgmt-eventgrid = callPackage ../development/python-modules/azure-mgmt-eventgrid { }; @@ -417,7 +596,8 @@ in { azure-mgmt-iothub = callPackage ../development/python-modules/azure-mgmt-iothub { }; - azure-mgmt-iothubprovisioningservices = callPackage ../development/python-modules/azure-mgmt-iothubprovisioningservices { }; + azure-mgmt-iothubprovisioningservices = + callPackage ../development/python-modules/azure-mgmt-iothubprovisioningservices { }; azure-mgmt-keyvault = callPackage ../development/python-modules/azure-mgmt-keyvault { }; @@ -451,6 +631,8 @@ in { azure-mgmt-notificationhubs = callPackage ../development/python-modules/azure-mgmt-notificationhubs { }; + azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; + azure-mgmt-policyinsights = callPackage ../development/python-modules/azure-mgmt-policyinsights { }; azure-mgmt-powerbiembedded = callPackage ../development/python-modules/azure-mgmt-powerbiembedded { }; @@ -459,10 +641,10 @@ in { azure-mgmt-rdbms = callPackage ../development/python-modules/azure-mgmt-rdbms { }; - azure-mgmt-recoveryservices = callPackage ../development/python-modules/azure-mgmt-recoveryservices { }; - azure-mgmt-recoveryservicesbackup = callPackage ../development/python-modules/azure-mgmt-recoveryservicesbackup { }; + azure-mgmt-recoveryservices = callPackage ../development/python-modules/azure-mgmt-recoveryservices { }; + azure-mgmt-redhatopenshift = callPackage ../development/python-modules/azure-mgmt-redhatopenshift { }; azure-mgmt-redis = callPackage ../development/python-modules/azure-mgmt-redis { }; @@ -499,1507 +681,33 @@ in { azure-multiapi-storage = callPackage ../development/python-modules/azure-multiapi-storage { }; - backports_csv = callPackage ../development/python-modules/backports_csv {}; + azure-nspkg = callPackage ../development/python-modules/azure-nspkg { }; - backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {}; + azure-servicebus = callPackage ../development/python-modules/azure-servicebus { }; - bacpypes = callPackage ../development/python-modules/bacpypes {}; + azure-servicefabric = callPackage ../development/python-modules/azure-servicefabric { }; - bap = callPackage ../development/python-modules/bap { - bap = pkgs.ocaml-ng.ocamlPackages_4_06.bap; - }; + azure-servicemanagement-legacy = callPackage ../development/python-modules/azure-servicemanagement-legacy { }; - baselines = callPackage ../development/python-modules/baselines { }; + azure-storage-blob = callPackage ../development/python-modules/azure-storage-blob { }; - bash_kernel = callPackage ../development/python-modules/bash_kernel { - inherit (pkgs) bash; - }; + azure-storage = callPackage ../development/python-modules/azure-storage { }; - bashlex = callPackage ../development/python-modules/bashlex { }; + azure-storage-common = callPackage ../development/python-modules/azure-storage-common { }; - bayesian-optimization = callPackage ../development/python-modules/bayesian-optimization { }; + azure-storage-file = callPackage ../development/python-modules/azure-storage-file { }; - bayespy = callPackage ../development/python-modules/bayespy { }; + azure-storage-file-share = callPackage ../development/python-modules/azure-storage-file-share { }; - beanstalkc = callPackage ../development/python-modules/beanstalkc { }; + azure-storage-nspkg = callPackage ../development/python-modules/azure-storage-nspkg { }; - beancount_docverif = callPackage ../development/python-modules/beancount_docverif { }; + azure-storage-queue = callPackage ../development/python-modules/azure-storage-queue { }; - biplist = callPackage ../development/python-modules/biplist { }; + Babel = callPackage ../development/python-modules/Babel { }; - bip_utils = callPackage ../development/python-modules/bip_utils { }; + babelfish = callPackage ../development/python-modules/babelfish { }; - bitarray = callPackage ../development/python-modules/bitarray { }; - - bitcoinlib = callPackage ../development/python-modules/bitcoinlib { }; - - bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { }; - - blivet = callPackage ../development/python-modules/blivet { }; - - bluepy = callPackage ../development/python-modules/bluepy { }; - - boltons = callPackage ../development/python-modules/boltons { }; - - bravia-tv = callPackage ../development/python-modules/bravia-tv { }; - - braintree = callPackage ../development/python-modules/braintree { }; - - breezy = callPackage ../development/python-modules/breezy { }; - - brother = callPackage ../development/python-modules/brother { }; - - build = callPackage ../development/python-modules/build { }; - - bytecode = callPackage ../development/python-modules/bytecode { }; - - ciso8601 = callPackage ../development/python-modules/ciso8601 { }; - - deepdiff = callPackage ../development/python-modules/deepdiff { }; - - deepmerge = callPackage ../development/python-modules/deepmerge { }; - - django-sesame = callPackage ../development/python-modules/django-sesame { }; - - bravado-core = callPackage ../development/python-modules/bravado-core { }; - - breathe = callPackage ../development/python-modules/breathe { }; - - brotli = callPackage ../development/python-modules/brotli { }; - - broadlink = callPackage ../development/python-modules/broadlink { }; - - browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { }; - - browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy {}); - - btrfs = callPackage ../development/python-modules/btrfs { }; - - bt_proximity = callPackage ../development/python-modules/bt-proximity { }; - - bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 - - bugsnag = callPackage ../development/python-modules/bugsnag { }; - - cachecontrol = callPackage ../development/python-modules/cachecontrol { }; - - cachelib = callPackage ../development/python-modules/cachelib { }; - - cachy = callPackage ../development/python-modules/cachy { }; - - cadquery = callPackage ../development/python-modules/cadquery { }; - - catalogue = callPackage ../development/python-modules/catalogue { }; - - cbeams = callPackage ../misc/cbeams { }; - - cdecimal = callPackage ../development/python-modules/cdecimal { }; - - certbot = callPackage ../development/python-modules/certbot { }; - - certbot-dns-cloudflare = callPackage ../development/python-modules/certbot-dns-cloudflare { }; - - certbot-dns-rfc2136 = callPackage ../development/python-modules/certbot-dns-rfc2136 { }; - - certbot-dns-route53 = callPackage ../development/python-modules/certbot-dns-route53 { }; - - cfn-flip = callPackage ../development/python-modules/cfn-flip { }; - - chalice = callPackage ../development/python-modules/chalice { }; - - channels-redis = callPackage ../development/python-modules/channels-redis { }; - - cleo = callPackage ../development/python-modules/cleo { }; - - clikit = callPackage ../development/python-modules/clikit { }; - - cliff = callPackage ../development/python-modules/cliff { }; - - clifford = callPackage ../development/python-modules/clifford { }; - - clickclick = callPackage ../development/python-modules/clickclick { }; - - clustershell = callPackage ../development/python-modules/clustershell { }; - - cnvkit = callPackage ../development/python-modules/cnvkit { }; - - cocotb = callPackage ../development/python-modules/cocotb { }; - - compiledb = callPackage ../development/python-modules/compiledb { }; - - connexion = callPackage ../development/python-modules/connexion { }; - - coordinates = callPackage ../development/python-modules/coordinates { }; - - cozy = callPackage ../development/python-modules/cozy { }; - - codespell = callPackage ../development/python-modules/codespell { }; - - convertdate = callPackage ../development/python-modules/convertdate { }; - - cot = callPackage ../development/python-modules/cot { }; - - crc32c = callPackage ../development/python-modules/crc32c { }; - - curio = callPackage ../development/python-modules/curio { }; - - dendropy = callPackage ../development/python-modules/dendropy { }; - - denonavr = callPackage ../development/python-modules/denonavr { }; - - dependency-injector = callPackage ../development/python-modules/dependency-injector { }; - - btchip = callPackage ../development/python-modules/btchip { }; - - databricks-cli = callPackage ../development/python-modules/databricks-cli { }; - - datatable = callPackage ../development/python-modules/datatable { - inherit (pkgs.llvmPackages) openmp libcxx libcxxabi; - }; - - databases = callPackage ../development/python-modules/databases { }; - - datamodeldict = callPackage ../development/python-modules/datamodeldict { }; - - datasette = callPackage ../development/python-modules/datasette { }; - - datashader = callPackage ../development/python-modules/datashader { }; - - dbf = callPackage ../development/python-modules/dbf { }; - - dbfread = callPackage ../development/python-modules/dbfread { }; - - deap = callPackage ../development/python-modules/deap { }; - - deeptoolsintervals = callPackage ../development/python-modules/deeptoolsintervals { }; - - dkimpy = callPackage ../development/python-modules/dkimpy { }; - - diceware = callPackage ../development/python-modules/diceware { }; - - dictionaries = callPackage ../development/python-modules/dictionaries { }; - - diff_cover = callPackage ../development/python-modules/diff_cover { }; - - diofant = callPackage ../development/python-modules/diofant { }; - - dipy = callPackage ../development/python-modules/dipy { }; - - docrep = callPackage ../development/python-modules/docrep { }; - - dominate = callPackage ../development/python-modules/dominate { }; - - dotnetcore2 = callPackage ../development/python-modules/dotnetcore2 { - inherit (pkgs) substituteAll dotnet-sdk; - }; - - emcee = callPackage ../development/python-modules/emcee { }; - - emailthreads = callPackage ../development/python-modules/emailthreads { }; - - email_validator = callPackage ../development/python-modules/email-validator { }; - - ewmh = callPackage ../development/python-modules/ewmh { }; - - exchangelib = callPackage ../development/python-modules/exchangelib { }; - - dcmstack = callPackage ../development/python-modules/dcmstack { }; - - dbus-python = callPackage ../development/python-modules/dbus { - inherit (pkgs) dbus pkgconfig; - }; - - debts = callPackage ../development/python-modules/debts { }; - - dftfit = callPackage ../development/python-modules/dftfit { }; - - dicom2nifti = callPackage ../development/python-modules/dicom2nifti { }; - - discid = callPackage ../development/python-modules/discid { }; - - discordpy = callPackage ../development/python-modules/discordpy { }; - - parver = callPackage ../development/python-modules/parver { }; - arpeggio = callPackage ../development/python-modules/arpeggio { }; - - influxdb-client = callPackage ../development/python-modules/influxdb-client { }; - - invoke = callPackage ../development/python-modules/invoke { }; - - distorm3 = callPackage ../development/python-modules/distorm3 { }; - - distlib = callPackage ../development/python-modules/distlib { }; - - distributed = callPackage ../development/python-modules/distributed { }; - - docutils = callPackage ../development/python-modules/docutils { }; - - dogtail = callPackage ../development/python-modules/dogtail { }; - - diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; - - eliot = callPackage ../development/python-modules/eliot {}; - - entrance = callPackage ../development/python-modules/entrance { routerFeatures = false; }; - - entrance-with-router-features = callPackage ../development/python-modules/entrance { routerFeatures = true; }; - - eradicate = callPackage ../development/python-modules/eradicate { }; - - face = callPackage ../development/python-modules/face { }; - - fastparquet = callPackage ../development/python-modules/fastparquet { }; - - fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { }; - - fasttext = callPackage ../development/python-modules/fasttext { }; - - facedancer = callPackage ../development/python-modules/facedancer { }; - - favicon = callPackage ../development/python-modules/favicon { }; - - fdint = callPackage ../development/python-modules/fdint { }; - - fido2 = callPackage ../development/python-modules/fido2 { }; - - filterpy = callPackage ../development/python-modules/filterpy { }; - - filemagic = callPackage ../development/python-modules/filemagic { }; - - finalfusion = callPackage ../development/python-modules/finalfusion { }; - - fints = callPackage ../development/python-modules/fints { }; - - fire = callPackage ../development/python-modules/fire { }; - - firetv = callPackage ../development/python-modules/firetv { }; - - flower = callPackage ../development/python-modules/flower { }; - - flufl_bounce = callPackage ../development/python-modules/flufl/bounce.nix { }; - - flufl_i18n = callPackage ../development/python-modules/flufl/i18n.nix { }; - - flufl_lock = callPackage ../development/python-modules/flufl/lock.nix { }; - - foxdot = callPackage ../development/python-modules/foxdot { }; - - freetype-py = callPackage ../development/python-modules/freetype-py { }; - - fsspec = callPackage ../development/python-modules/fsspec { }; - - furl = callPackage ../development/python-modules/furl { }; - - fuse = callPackage ../development/python-modules/fuse-python { - inherit (pkgs) fuse pkgconfig; - }; - - fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { }; - - genanki = callPackage ../development/python-modules/genanki { }; - - geoip2 = callPackage ../development/python-modules/geoip2 { }; - - getmac = callPackage ../development/python-modules/getmac { }; - - gidgethub = callPackage ../development/python-modules/gidgethub { }; - - gin-config = callPackage ../development/python-modules/gin-config { }; - - globus-sdk = callPackage ../development/python-modules/globus-sdk { }; - - glymur = callPackage ../development/python-modules/glymur { }; - - glob2 = callPackage ../development/python-modules/glob2 { }; - - globre = callPackage ../development/python-modules/globre { }; - - glom = callPackage ../development/python-modules/glom { }; - - gdcm = disabledIf isPy27 (toPythonModule (pkgs.gdcm.override { - inherit (self) python; - enablePython = true; - })); - - goocalendar = callPackage ../development/python-modules/goocalendar { }; - - grandalf = callPackage ../development/python-modules/grandalf { }; - - gprof2dot = callPackage ../development/python-modules/gprof2dot { - inherit (pkgs) graphviz; - }; - - gsd = if isPy27 then - callPackage ../development/python-modules/gsd/1.7.nix { } - else - callPackage ../development/python-modules/gsd { }; - - gssapi = callPackage ../development/python-modules/gssapi { - inherit (pkgs) darwin krb5Full; - }; - - guestfs = callPackage ../development/python-modules/guestfs { }; - - gumath = callPackage ../development/python-modules/gumath { }; - - h3 = callPackage ../development/python-modules/h3 { inherit (pkgs) h3; }; - - h5py = callPackage ../development/python-modules/h5py { - hdf5 = pkgs.hdf5; - }; - - h5py-mpi = self.h5py.override { - hdf5 = pkgs.hdf5-mpi; - }; - - h5netcdf = callPackage ../development/python-modules/h5netcdf { }; - - ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; - - habanero = callPackage ../development/python-modules/habanero { }; - - handout = callPackage ../development/python-modules/handout { }; - - HAP-python = callPackage ../development/python-modules/HAP-python { }; - - helper = callPackage ../development/python-modules/helper { }; - - hdmedians = callPackage ../development/python-modules/hdmedians { }; - - hdlparse = callPackage ../development/python-modules/hdlparse { }; - - hiyapyco = callPackage ../development/python-modules/hiyapyco { }; - - hocr-tools = callPackage ../development/python-modules/hocr-tools { }; - - holidays = callPackage ../development/python-modules/holidays { }; - - holoviews = callPackage ../development/python-modules/holoviews { }; - - hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { - inherit python; - }); - - hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { }; - - http-ece = callPackage ../development/python-modules/http-ece { }; - - httpsig = callPackage ../development/python-modules/httpsig { }; - - httptools = callPackage ../development/python-modules/httptools { }; - - hwi = callPackage ../development/python-modules/hwi { }; - - i3ipc = callPackage ../development/python-modules/i3ipc { }; - - ignite = callPackage ../development/python-modules/ignite { }; - - ihatemoney = callPackage ../development/python-modules/ihatemoney { }; - - imutils = callPackage ../development/python-modules/imutils { }; - - inotify-simple = callPackage ../development/python-modules/inotify-simple { }; - - intake = callPackage ../development/python-modules/intake { }; - - intelhex = callPackage ../development/python-modules/intelhex { }; - - inquirer = callPackage ../development/python-modules/inquirer { }; - - ipympl = callPackage ../development/python-modules/ipympl { }; - - itanium_demangler = callPackage ../development/python-modules/itanium_demangler { }; - - itemadapter = callPackage ../development/python-modules/itemadapter { }; - - itemloaders = callPackage ../development/python-modules/itemloaders { }; - - iterm2 = callPackage ../development/python-modules/iterm2 { }; - - janus = callPackage ../development/python-modules/janus { }; - - jc = callPackage ../development/python-modules/jc { }; - - jellyfin-apiclient-python = callPackage ../development/python-modules/jellyfin-apiclient-python { }; - - jira = callPackage ../development/python-modules/jira { }; - - jsonpath = callPackage ../development/python-modules/jsonpath { }; - - junit-xml = callPackage ../development/python-modules/junit-xml { }; - - junitparser = callPackage ../development/python-modules/junitparser { }; - - jwcrypto = callPackage ../development/python-modules/jwcrypto { }; - - kconfiglib = callPackage ../development/python-modules/kconfiglib { }; - - kinparse = callPackage ../development/python-modules/kinparse { }; - - labelbox = callPackage ../development/python-modules/labelbox { }; - - lammps-cython = callPackage ../development/python-modules/lammps-cython { - mpi = pkgs.openmpi; - }; - - langdetect = callPackage ../development/python-modules/langdetect { }; - - launchpadlib = callPackage ../development/python-modules/launchpadlib { }; - - lazr_config = callPackage ../development/python-modules/lazr/config.nix { }; - - lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { }; - - lazr-restfulclient = callPackage ../development/python-modules/lazr-restfulclient { }; - - lazr-uri = callPackage ../development/python-modules/lazr-uri { }; - - libmr = callPackage ../development/python-modules/libmr { }; - - limitlessled = callPackage ../development/python-modules/limitlessled { }; - - livelossplot = callPackage ../development/python-modules/livelossplot { }; - - lmtpd = callPackage ../development/python-modules/lmtpd { }; - - logster = callPackage ../development/python-modules/logster { }; - - loguru = callPackage ../development/python-modules/loguru { }; - - logzero = callPackage ../development/python-modules/logzero { }; - - mac_alias = callPackage ../development/python-modules/mac_alias { }; - - macropy = callPackage ../development/python-modules/macropy { }; - - mail-parser = callPackage ../development/python-modules/mail-parser { }; - - mailman = callPackage ../servers/mail/mailman { }; - - mailman-web = callPackage ../servers/mail/mailman/web.nix { }; - - mailmanclient = callPackage ../development/python-modules/mailmanclient { }; - - mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { }; - - manhole = callPackage ../development/python-modules/manhole { }; - - mapbox = callPackage ../development/python-modules/mapbox { }; - - markerlib = callPackage ../development/python-modules/markerlib { }; - - mask-rcnn = callPackage ../development/python-modules/mask-rcnn { }; - - matchpy = callPackage ../development/python-modules/matchpy { }; - - mathlibtools = callPackage ../development/python-modules/mathlibtools {}; - - maxminddb = callPackage ../development/python-modules/maxminddb { }; - - mininet-python = (toPythonModule (pkgs.mininet.override{ inherit python; })).py; - - mkl-service = callPackage ../development/python-modules/mkl-service { }; - - mnist = callPackage ../development/python-modules/mnist { }; - - monkeyhex = callPackage ../development/python-modules/monkeyhex { }; - - monty = callPackage ../development/python-modules/monty { }; - - mpi4py = callPackage ../development/python-modules/mpi4py { - mpi = pkgs.openmpi; - }; - - pytest-freezegun = callPackage ../development/python-modules/pytest-freezegun { }; - - python-baseconv = callPackage ../development/python-modules/python-baseconv { }; - - pycognito = callPackage ../development/python-modules/pycognito { }; - - python-mpv-jsonipc = callPackage ../development/python-modules/python-mpv-jsonipc { }; - - mortgage = callPackage ../development/python-modules/mortgage { }; - - msal = callPackage ../development/python-modules/msal { }; - - msal-extensions = callPackage ../development/python-modules/msal-extensions { }; - - msrest = callPackage ../development/python-modules/msrest { }; - - msrestazure = callPackage ../development/python-modules/msrestazure { }; - - multiset = callPackage ../development/python-modules/multiset { }; - - mwclient = callPackage ../development/python-modules/mwclient { }; - - mwoauth = callPackage ../development/python-modules/mwoauth { }; - - nagiosplugin = callPackage ../development/python-modules/nagiosplugin { }; - - nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; }; - - nassl = callPackage ../development/python-modules/nassl { }; - - nbsmoke = callPackage ../development/python-modules/nbsmoke { }; - - nbsphinx = callPackage ../development/python-modules/nbsphinx { }; - - nbval = callPackage ../development/python-modules/nbval { }; - - ndtypes = callPackage ../development/python-modules/ndtypes { }; - - neo = callPackage ../development/python-modules/neo { }; - - nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; - - neuron = pkgs.neuron.override { - inherit python; - }; - - neuron-mpi = pkgs.neuron-mpi.override { - inherit python; - }; - - nix-prefetch-github = callPackage ../development/python-modules/nix-prefetch-github { }; - - nixpart = callPackage ../tools/filesystems/nixpart { }; - - # This is used for NixOps to make sure we won't break it with the next major - # version of nixpart. - nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { }; - - nltk = callPackage ../development/python-modules/nltk { }; - - ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; - - nvchecker = callPackage ../development/python-modules/nvchecker { }; - - numericalunits = callPackage ../development/python-modules/numericalunits { }; - - nunavut = callPackage ../development/python-modules/nunavut { }; - - oath = callPackage ../development/python-modules/oath { }; - - oauthenticator = callPackage ../development/python-modules/oauthenticator { }; - - onnx = callPackage ../development/python-modules/onnx { }; - - ordered-set = callPackage ../development/python-modules/ordered-set { }; - - orderedmultidict = callPackage ../development/python-modules/orderedmultidict { }; - - ortools = (toPythonModule (pkgs.or-tools.override { - inherit (self) python; - })).python; - - osmnx = callPackage ../development/python-modules/osmnx { }; - - osmpythontools = callPackage ../development/python-modules/osmpythontools { }; - - outcome = callPackage ../development/python-modules/outcome {}; - - ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { - pythonPackages = self; - }); - - palettable = callPackage ../development/python-modules/palettable { }; - - papermill = callPackage ../development/python-modules/papermill { }; - - parsley = callPackage ../development/python-modules/parsley { }; - - pastel = callPackage ../development/python-modules/pastel { }; - - pathlib = callPackage ../development/python-modules/pathlib { }; - - pc-ble-driver-py = toPythonModule (callPackage ../development/python-modules/pc-ble-driver-py { }); - - pcpp = callPackage ../development/python-modules/pcpp { }; - - pdf2image = callPackage ../development/python-modules/pdf2image { }; - - pdfminer = callPackage ../development/python-modules/pdfminer_six { }; - - pdfposter = callPackage ../development/python-modules/pdfposter { }; - - pdftotext = callPackage ../development/python-modules/pdftotext { }; - - pdfx = callPackage ../development/python-modules/pdfx { }; - - pushover-complete = callPackage ../development/python-modules/pushover-complete { }; - - pyicloud = callPackage ../development/python-modules/pyicloud { }; - - pyperf = callPackage ../development/python-modules/pyperf { }; - - pyphotonfile = callPackage ../development/python-modules/pyphotonfile { }; - - pefile = callPackage ../development/python-modules/pefile { }; - - perfplot = callPackage ../development/python-modules/perfplot { }; - - phonopy = callPackage ../development/python-modules/phonopy { }; - - phik = callPackage ../development/python-modules/phik {}; - - piccata = callPackage ../development/python-modules/piccata {}; - - pims = callPackage ../development/python-modules/pims { }; - - poetry = callPackage ../development/python-modules/poetry { }; - - poetry-core = callPackage ../development/python-modules/poetry-core { }; - - polyline = callPackage ../development/python-modules/polyline { }; - - postorius = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/postorius.nix { }); - - pplpy = callPackage ../development/python-modules/pplpy { }; - - pprintpp = callPackage ../development/python-modules/pprintpp { }; - - progress = callPackage ../development/python-modules/progress { }; - - proglog = callPackage ../development/python-modules/proglog { }; - - pulsectl = callPackage ../development/python-modules/pulsectl { }; - - pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { }; - - pure-eval = callPackage ../development/python-modules/pure-eval {}; - - purl = callPackage ../development/python-modules/purl { }; - - pyclipper = callPackage ../development/python-modules/pyclipper { }; - - pymystem3 = callPackage ../development/python-modules/pymystem3 { }; - - pymysql = callPackage ../development/python-modules/pymysql { }; - - pymupdf = callPackage ../development/python-modules/pymupdf { }; - - pynamecheap = callPackage ../development/python-modules/pynamecheap { }; - - Pmw = callPackage ../development/python-modules/Pmw { }; - - py_stringmatching = callPackage ../development/python-modules/py_stringmatching { }; - - pyaes = callPackage ../development/python-modules/pyaes { }; - - pyairvisual = callPackage ../development/python-modules/pyairvisual { }; - - pyamf = callPackage ../development/python-modules/pyamf { }; - - pyarrow = callPackage ../development/python-modules/pyarrow { - inherit (pkgs) arrow-cpp cmake pkgconfig; - }; - - pyannotate = callPackage ../development/python-modules/pyannotate { }; - - pyatspi = callPackage ../development/python-modules/pyatspi { - inherit (pkgs) pkgconfig; - }; - - pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { }; - - pybids = callPackage ../development/python-modules/pybids { }; - - pybind11 = callPackage ../development/python-modules/pybind11 { }; - - py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); - - pybullet = callPackage ../development/python-modules/pybullet { }; - - pycairo = callPackage ../development/python-modules/pycairo { - inherit (pkgs) meson pkgconfig; - }; - - pycategories = callPackage ../development/python-modules/pycategories { }; - - pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { - inherit (pkgs) pkgconfig; - }); - - pycrc = callPackage ../development/python-modules/pycrc { }; - - pycrypto = callPackage ../development/python-modules/pycrypto { }; - - pycryptodome = callPackage ../development/python-modules/pycryptodome { }; - - pycryptodomex = callPackage ../development/python-modules/pycryptodomex { }; - - PyChromecast = callPackage ../development/python-modules/pychromecast { }; - - pycm = callPackage ../development/python-modules/pycm { }; - - py-cpuinfo = callPackage ../development/python-modules/py-cpuinfo { }; - - py-lru-cache = callPackage ../development/python-modules/py-lru-cache { }; - - py-multibase = callPackage ../development/python-modules/py-multibase { }; - - py-multihash = callPackage ../development/python-modules/py-multihash { }; - - py-radix = callPackage ../development/python-modules/py-radix { }; - - pydbus = callPackage ../development/python-modules/pydbus { }; - - pydicom = callPackage ../development/python-modules/pydicom { }; - - pydocstyle = - if isPy27 then - callPackage ../development/python-modules/pydocstyle/2.nix { } - else - callPackage ../development/python-modules/pydocstyle { }; - - pydocumentdb = callPackage ../development/python-modules/pydocumentdb { }; - - pydrive = callPackage ../development/python-modules/pydrive { }; - - pydy = callPackage ../development/python-modules/pydy { }; - - pyexiv2 = disabledIf isPy3k (toPythonModule (callPackage ../development/python-modules/pyexiv2 {})); - - py3exiv2 = callPackage ../development/python-modules/py3exiv2 { }; - - pyfakefs = callPackage ../development/python-modules/pyfakefs {}; - - pyfaidx = callPackage ../development/python-modules/pyfaidx { }; - - pyfcm = callPackage ../development/python-modules/pyfcm { }; - - pyfttt = callPackage ../development/python-modules/pyfttt { }; - - pyftdi = callPackage ../development/python-modules/pyftdi { }; - - pygame = callPackage ../development/python-modules/pygame { }; - - pygbm = callPackage ../development/python-modules/pygbm { }; - - pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; - - pygdbmi = callPackage ../development/python-modules/pygdbmi { }; - - pygmo = callPackage ../development/python-modules/pygmo { }; - - pygobject2 = callPackage ../development/python-modules/pygobject { - inherit (pkgs) pkgconfig; - }; - - pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { - inherit (pkgs) meson pkgconfig; - }; - - pygtail = callPackage ../development/python-modules/pygtail { }; - - pygtk = callPackage ../development/python-modules/pygtk { - inherit (pkgs) pkgconfig; - libglade = null; - }; - - pygtksourceview = callPackage ../development/python-modules/pygtksourceview { - inherit (pkgs) pkgconfig; - }; - - pyGtkGlade = self.pygtk.override { - libglade = pkgs.gnome2.libglade; - }; - - pyjwkest = callPackage ../development/python-modules/pyjwkest { }; - - pykdtree = callPackage ../development/python-modules/pykdtree { - inherit (pkgs.llvmPackages) openmp; - }; - - pykerberos = callPackage ../development/python-modules/pykerberos { }; - - pykeepass = callPackage ../development/python-modules/pykeepass { }; - - pylev = callPackage ../development/python-modules/pylev { }; - - pylibftdi = callPackage ../development/python-modules/pylibftdi { - inherit (pkgs) libusb1; - }; - - pymatgen = callPackage ../development/python-modules/pymatgen { }; - - pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { }; - - pymavlink = callPackage ../development/python-modules/pymavlink { }; - - pymeeus = callPackage ../development/python-modules/pymeeus { }; - - pymsgbox = callPackage ../development/python-modules/pymsgbox { }; - - pynanoleaf = callPackage ../development/python-modules/pynanoleaf { }; - - pynisher = callPackage ../development/python-modules/pynisher { }; - - pynput = callPackage ../development/python-modules/pynput { }; - - pyparser = callPackage ../development/python-modules/pyparser { }; - - pyres = callPackage ../development/python-modules/pyres { }; - - PyRMVtransport = callPackage ../development/python-modules/PyRMVtransport { }; - - pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { - inherit (pkgs) pkgconfig; - }; - - pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { - pythonPackages = self; - }; - - /* - `pyqt5_with_qtwebkit` should not be used by python libraries in - pkgs/development/python-modules/*. Putting this attribute in - `propagatedBuildInputs` may cause collisions. - */ - pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; }; - - pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; - - pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { - pythonPackages = self; - }; - - pysc2 = callPackage ../development/python-modules/pysc2 { }; - - pyscard = callPackage ../development/python-modules/pyscard { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; }; - - pyschedule = callPackage ../development/python-modules/pyschedule { }; - - pyscreenshot = callPackage ../development/python-modules/pyscreenshot { }; - - pydsdl = callPackage ../development/python-modules/pydsdl { }; - - pyside = callPackage ../development/python-modules/pyside { - inherit (pkgs) mesa; - }; - - pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { - inherit (pkgs) libxml2 libxslt; # Do not need the Python bindings. - }; - - pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; - - pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { - inherit (pkgs) cmake qt5 ninja; - }); - - shiboken2 = toPythonModule (callPackage ../development/python-modules/shiboken2 { - inherit (pkgs) cmake qt5 llvmPackages; - }); - - simplefix = callPackage ../development/python-modules/simplefix { }; - - pyscrypt = callPackage ../development/python-modules/pyscrypt { }; - - pyside2-tools = toPythonModule (callPackage ../development/python-modules/pyside2-tools { - inherit (pkgs) cmake qt5; - }); - - pyslurm = callPackage ../development/python-modules/pyslurm { - slurm = pkgs.slurm; - }; - - pysmb = callPackage ../development/python-modules/pysmb { }; - - pysmf = callPackage ../development/python-modules/pysmf { }; - - pyspinel = callPackage ../development/python-modules/pyspinel {}; - - pyssim = callPackage ../development/python-modules/pyssim { }; - - pystache = callPackage ../development/python-modules/pystache { }; - - pystray = callPackage ../development/python-modules/pystray { }; - - pytelegrambotapi = callPackage ../development/python-modules/pyTelegramBotAPI { }; - - pytesseract = callPackage ../development/python-modules/pytesseract { }; - - pytest-bdd = callPackage ../development/python-modules/pytest-bdd { }; - - pytest-black = callPackage ../development/python-modules/pytest-black { }; - - pytest-click = callPackage ../development/python-modules/pytest-click { }; - - pytest-check = callPackage ../development/python-modules/pytest-check { }; - - pytest-env = callPackage ../development/python-modules/pytest-env { }; - - pytest-factoryboy = callPackage ../development/python-modules/pytest-factoryboy { }; - - pytest-flask = callPackage ../development/python-modules/pytest-flask { }; - - pytest-mypy = callPackage ../development/python-modules/pytest-mypy { }; - - pytest-ordering = callPackage ../development/python-modules/pytest-ordering { }; - - pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; - - pytest-qt = callPackage ../development/python-modules/pytest-qt { }; - - pytest-testmon = callPackage ../development/python-modules/pytest-testmon { }; - - pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; - - pytest-tornasync = callPackage ../development/python-modules/pytest-tornasync { }; - - pytest-trio = callPackage ../development/python-modules/pytest-trio { }; - - pytest-twisted = callPackage ../development/python-modules/pytest-twisted { }; - - pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; - - pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { }; - - pytmx = callPackage ../development/python-modules/pytmx { }; - - pythonmagick = callPackage ../development/python-modules/pythonmagick { }; - - python-binance = callPackage ../development/python-modules/python-binance { }; - - python-dbusmock = callPackage ../development/python-modules/python-dbusmock { }; - - python-dotenv = callPackage ../development/python-modules/python-dotenv { }; - - python-engineio = callPackage ../development/python-modules/python-engineio { }; - - python-hosts = callPackage ../development/python-modules/python-hosts { }; - - python-lz4 = callPackage ../development/python-modules/python-lz4 { }; - lz4 = self.python-lz4; # alias 2018-12-05 - - python-ldap-test = callPackage ../development/python-modules/python-ldap-test { }; - - python-mnist = callPackage ../development/python-modules/python-mnist { }; - - pythonocc-core = toPythonModule (callPackage ../development/python-modules/pythonocc-core { - inherit (pkgs.xorg) libX11; - }); - - python-igraph = callPackage ../development/python-modules/python-igraph { - pkgconfig = pkgs.pkgconfig; - igraph = pkgs.igraph; - }; - - python-olm = callPackage ../development/python-modules/python-olm { }; - - python3-openid = callPackage ../development/python-modules/python3-openid { }; - - python-packer = callPackage ../development/python-modules/python-packer { }; - - python-periphery = callPackage ../development/python-modules/python-periphery { }; - - python-prctl = callPackage ../development/python-modules/python-prctl { }; - - python-rapidjson = callPackage ../development/python-modules/python-rapidjson { }; - - python-redis-lock = callPackage ../development/python-modules/python-redis-lock { }; - - python-rtmidi = callPackage ../development/python-modules/python-rtmidi { }; - - python-sql = callPackage ../development/python-modules/python-sql { }; - - python-snappy = callPackage ../development/python-modules/python-snappy { - inherit (pkgs) snappy; - }; - - python-stdnum = callPackage ../development/python-modules/python-stdnum { }; - - python-socketio = callPackage ../development/python-modules/python-socketio { }; - - python-utils = callPackage ../development/python-modules/python-utils { }; - - python-vipaccess = callPackage ../development/python-modules/python-vipaccess { }; - - pytimeparse = callPackage ../development/python-modules/pytimeparse { }; - - pytricia = callPackage ../development/python-modules/pytricia { }; - - pytrends = callPackage ../development/python-modules/pytrends { }; - - py-vapid = callPackage ../development/python-modules/py-vapid { }; - - PyWebDAV = callPackage ../development/python-modules/pywebdav { }; - - pywebpush = callPackage ../development/python-modules/pywebpush { }; - - pywebview = callPackage ../development/python-modules/pywebview { }; - - pywick = callPackage ../development/python-modules/pywick { }; - - pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml{ }); - - pyvcd = callPackage ../development/python-modules/pyvcd { }; - - pyvcf = callPackage ../development/python-modules/pyvcf { }; - - pyvoro = callPackage ../development/python-modules/pyvoro { }; - - radish-bdd = callPackage ../development/python-modules/radish-bdd { }; - - relatorio = callPackage ../development/python-modules/relatorio { }; - - reproject = callPackage ../development/python-modules/reproject { }; - - remotecv = callPackage ../development/python-modules/remotecv { }; - - pyzufall = callPackage ../development/python-modules/pyzufall { }; - - rig = callPackage ../development/python-modules/rig { }; - - rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl {}); - - rlp = callPackage ../development/python-modules/rlp { }; - - rq = callPackage ../development/python-modules/rq { }; - - rtmidi-python = callPackage ../development/python-modules/rtmidi-python { }; - - rx = callPackage ../development/python-modules/rx { }; - - sabyenc = callPackage ../development/python-modules/sabyenc { }; - - sabyenc3 = callPackage ../development/python-modules/sabyenc3 { }; - - salmon-mail = callPackage ../development/python-modules/salmon-mail { }; - - sanic-auth = callPackage ../development/python-modules/sanic-auth { }; - - sapi-python-client = callPackage ../development/python-modules/sapi-python-client { }; - - seekpath = callPackage ../development/python-modules/seekpath { }; - - selectors2 = callPackage ../development/python-modules/selectors2 { }; - - sacremoses = callPackage ../development/python-modules/sacremoses { }; - - sentencepiece = callPackage ../development/python-modules/sentencepiece { - inherit (pkgs) sentencepiece pkgconfig; - }; - - tokenizers = disabledIf (!isPy3k) - (toPythonModule (callPackage ../development/python-modules/tokenizers { })); - - towncrier = callPackage ../development/python-modules/towncrier { - inherit (pkgs) git; - }; - - transformers = callPackage ../development/python-modules/transformers { }; - - transforms3d = callPackage ../development/python-modules/transforms3d { }; - - trimesh = callPackage ../development/python-modules/trimesh {}; - - sentinel = callPackage ../development/python-modules/sentinel { }; - - sentry-sdk = callPackage ../development/python-modules/sentry-sdk {}; - - sepaxml = callPackage ../development/python-modules/sepaxml { }; - - serversyncstorage = callPackage ../development/python-modules/serversyncstorage {}; - - shellingham = callPackage ../development/python-modules/shellingham {}; - - simpleaudio = callPackage ../development/python-modules/simpleaudio { }; - - simpleeval = callPackage ../development/python-modules/simpleeval { }; - - simple-salesforce = callPackage ../development/python-modules/simple-salesforce { }; - - singledispatch = callPackage ../development/python-modules/singledispatch { }; - - sip = callPackage ../development/python-modules/sip { }; - - sortedcontainers = callPackage ../development/python-modules/sortedcontainers { }; - - sklearn-deap = callPackage ../development/python-modules/sklearn-deap { }; - - skorch = callPackage ../development/python-modules/skorch { }; - - slackclient = callPackage ../development/python-modules/slackclient { }; - - slicedimage = callPackage ../development/python-modules/slicedimage { }; - - slicerator = callPackage ../development/python-modules/slicerator { }; - - slither-analyzer = callPackage ../development/python-modules/slither-analyzer { }; - - sly = callPackage ../development/python-modules/sly { }; - - snapcast = callPackage ../development/python-modules/snapcast { }; - - soapysdr = toPythonModule (pkgs.soapysdr.override { - python = self.python; - usePython = true; - }); - - soapysdr-with-plugins = toPythonModule (pkgs.soapysdr-with-plugins.override { - python = self.python; - usePython = true; - }); - - softlayer = callPackage ../development/python-modules/softlayer { }; - - sparse = callPackage ../development/python-modules/sparse { }; - - spglib = callPackage ../development/python-modules/spglib { }; - - spidev = callPackage ../development/python-modules/spidev { }; - - srvlookup = callPackage ../development/python-modules/srvlookup { }; - - sshpubkeys = callPackage ../development/python-modules/sshpubkeys { }; - - sshtunnel = callPackage ../development/python-modules/sshtunnel { }; - - sslib = callPackage ../development/python-modules/sslib { }; - - sslyze = callPackage ../development/python-modules/sslyze { }; - - statistics = callPackage ../development/python-modules/statistics { }; - - stm32loader = callPackage ../development/python-modules/stm32loader { }; - - stumpy = callPackage ../development/python-modules/stumpy { }; - - stups-cli-support = callPackage ../development/python-modules/stups-cli-support { }; - - stups-fullstop = callPackage ../development/python-modules/stups-fullstop { }; - - stups-pierone = callPackage ../development/python-modules/stups-pierone { }; - - stups-tokens = callPackage ../development/python-modules/stups-tokens { }; - - stups-zign = callPackage ../development/python-modules/stups-zign { }; - - sumo = callPackage ../development/python-modules/sumo { }; - - supervise_api = callPackage ../development/python-modules/supervise_api { }; - - tables = if isPy3k then callPackage ../development/python-modules/tables { - hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; - } else callPackage ../development/python-modules/tables/3.5.nix { - hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; - }; - - tag-expressions = callPackage ../development/python-modules/tag-expressions { }; - - tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; - - tesserocr = callPackage ../development/python-modules/tesserocr { }; - - tls-parser = callPackage ../development/python-modules/tls-parser { }; - - trueskill = callPackage ../development/python-modules/trueskill { }; - - trustme = callPackage ../development/python-modules/trustme {}; - - trio = callPackage ../development/python-modules/trio {}; - - sniffio = callPackage ../development/python-modules/sniffio { }; - - spyder-kernels = callPackage ../development/python-modules/spyder-kernels {}; - spyder-kernels_0_5 = callPackage ../development/python-modules/spyder-kernels/0.x.nix {}; - - spyder = callPackage ../development/python-modules/spyder {}; - spyder_3 = callPackage ../development/python-modules/spyder/3.nix { }; - - tenacity = callPackage ../development/python-modules/tenacity { }; - - tokenserver = callPackage ../development/python-modules/tokenserver {}; - - toml = callPackage ../development/python-modules/toml { }; - - tomlkit = callPackage ../development/python-modules/tomlkit { }; - - toggl-cli = callPackage ../development/python-modules/toggl-cli { }; - - uamqp = callPackage ../development/python-modules/uamqp { - inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork Security; - }; - - unifi = callPackage ../development/python-modules/unifi { }; - - uvcclient = callPackage ../development/python-modules/uvcclient { }; - - uvloop = callPackage ../development/python-modules/uvloop { - inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices; - }; - - pyuavcan = callPackage ../development/python-modules/pyuavcan { - # this version pinpoint to anold version is necessary due to a regression - nunavut = self.nunavut.overridePythonAttrs ( old: rec { - version = "0.2.3"; - src = old.src.override { - inherit version; - sha256 = "0x8a9h4mc2r2yz49s9arsbs4bn3h25mvmg4zbgksm9hcyi9536x5"; - }; - }); - }; - - pyunifi = callPackage ../development/python-modules/pyunifi { }; - - vdf = callPackage ../development/python-modules/vdf { }; - - vdirsyncer = callPackage ../development/python-modules/vdirsyncer { - inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security; - inherit (pkgs) pkg-config openssl rustPlatform; - }; - - vdirsyncerStable = callPackage ../development/python-modules/vdirsyncer/stable.nix { }; - - vidstab = callPackage ../development/python-modules/vidstab { }; - - webapp2 = callPackage ../development/python-modules/webapp2 { }; - - webdavclient3 = callPackage ../development/python-modules/webdavclient3 { }; - - wordcloud = callPackage ../development/python-modules/wordcloud { }; - - wrf-python = callPackage ../development/python-modules/wrf-python { }; - - pyunbound = callPackage ../tools/networking/unbound/python.nix { }; - - WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { }; - - yarg = callPackage ../development/python-modules/yarg { }; - - yt = callPackage ../development/python-modules/yt { }; - - # packages defined here - - aafigure = callPackage ../development/python-modules/aafigure { }; - - addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; - - algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { }; - - altair = callPackage ../development/python-modules/altair { }; - - vega = callPackage ../development/python-modules/vega { }; - - accupy = callPackage ../development/python-modules/accupy { }; - - acme = callPackage ../development/python-modules/acme { }; - - acme-tiny = callPackage ../development/python-modules/acme-tiny { }; - - actdiag = callPackage ../development/python-modules/actdiag { }; - - adal = callPackage ../development/python-modules/adal { }; - - affine = callPackage ../development/python-modules/affine { }; - - aioconsole = callPackage ../development/python-modules/aioconsole { }; - - aiodns = callPackage ../development/python-modules/aiodns { }; - - aiofiles = callPackage ../development/python-modules/aiofiles { }; - - aioh2 = callPackage ../development/python-modules/aioh2 { }; - - aioftp = callPackage ../development/python-modules/aioftp { }; - - aioharmony = callPackage ../development/python-modules/aioharmony { }; - - aiohttp = callPackage ../development/python-modules/aiohttp { }; - - aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; - - aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; - - aiohttp-remotes = callPackage ../development/python-modules/aiohttp-remotes { }; - - aiohttp-socks = callPackage ../development/python-modules/aiohttp-socks { }; - - aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { }; - - aiomysql = callPackage ../development/python-modules/aiomysql { }; - - aioprocessing = callPackage ../development/python-modules/aioprocessing { }; - - aioresponses = callPackage ../development/python-modules/aioresponses { }; - - aiosqlite = callPackage ../development/python-modules/aiosqlite { }; - - aiorpcx = callPackage ../development/python-modules/aiorpcx { }; - - aiosmtpd = callPackage ../development/python-modules/aiosmtpd { }; - - aiounifi = callPackage ../development/python-modules/aiounifi { }; - - aiounittest = callPackage ../development/python-modules/aiounittest { }; - - aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; - - ajpy = callPackage ../development/python-modules/ajpy { }; - - alabaster = callPackage ../development/python-modules/alabaster {}; - - alarmdecoder = callPackage ../development/python-modules/alarmdecoder {}; - - alembic = callPackage ../development/python-modules/alembic {}; - - allpairspy = callPackage ../development/python-modules/allpairspy { }; - - annexremote = callPackage ../development/python-modules/annexremote { }; - - ansible = callPackage ../development/python-modules/ansible { }; - - ansible-kernel = callPackage ../development/python-modules/ansible-kernel { }; - - ansible-lint = callPackage ../development/python-modules/ansible-lint { }; - - ansible-runner = callPackage ../development/python-modules/ansible-runner { }; - - ansicolors = callPackage ../development/python-modules/ansicolors {}; - - aniso8601 = callPackage ../development/python-modules/aniso8601 {}; - - anonip = callPackage ../development/python-modules/anonip { }; - - asgiref = callPackage ../development/python-modules/asgiref { }; - - python-editor = callPackage ../development/python-modules/python-editor { }; - - python-gnupg = callPackage ../development/python-modules/python-gnupg {}; - - python-uinput = callPackage ../development/python-modules/python-uinput {}; - - python-sybase = callPackage ../development/python-modules/sybase {}; - - alot = callPackage ../development/python-modules/alot {}; - - anyjson = callPackage ../development/python-modules/anyjson {}; - - amqp = callPackage ../development/python-modules/amqp {}; - - amqplib = callPackage ../development/python-modules/amqplib {}; - - antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime { antlr4 = pkgs.antlr4; }; - - antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { antlr4 = pkgs.antlr4; }; - - apache-airflow = callPackage ../development/python-modules/apache-airflow { }; - - apipkg = callPackage ../development/python-modules/apipkg {}; - - apispec = callPackage ../development/python-modules/apispec {}; - - appdirs = callPackage ../development/python-modules/appdirs { }; - - appleseed = disabledIf isPy3k - (toPythonModule (pkgs.appleseed.override { - inherit (self) python; - })); - - application = callPackage ../development/python-modules/application { }; - - applicationinsights = callPackage ../development/python-modules/applicationinsights { }; - - appnope = callPackage ../development/python-modules/appnope { }; - - approvaltests = callPackage ../development/python-modules/approvaltests { }; - - apptools = callPackage ../development/python-modules/apptools {}; - - apsw = callPackage ../development/python-modules/apsw {}; - - astor = callPackage ../development/python-modules/astor {}; - - asyncpg = callPackage ../development/python-modules/asyncpg { }; - - asyncssh = callPackage ../development/python-modules/asyncssh { }; - - atpublic = callPackage ../development/python-modules/atpublic { }; - - python-fontconfig = callPackage ../development/python-modules/python-fontconfig { }; - - funcsigs = callPackage ../development/python-modules/funcsigs { }; - - APScheduler = callPackage ../development/python-modules/APScheduler { }; - - args = callPackage ../development/python-modules/args { }; - - argcomplete = callPackage ../development/python-modules/argcomplete { }; - - area = callPackage ../development/python-modules/area { }; - - arxiv2bib = callPackage ../development/python-modules/arxiv2bib { }; - - chai = callPackage ../development/python-modules/chai { }; - - chainmap = callPackage ../development/python-modules/chainmap { }; - - arelle = callPackage ../development/python-modules/arelle { - gui = true; - }; - - arelle-headless = callPackage ../development/python-modules/arelle { - gui = false; - }; - - delegator-py = callPackage ../development/python-modules/delegator-py { }; - - deluge-client = callPackage ../development/python-modules/deluge-client { }; - - arrow = callPackage ../development/python-modules/arrow { }; - - asynctest = callPackage ../development/python-modules/asynctest { }; - - async-timeout = callPackage ../development/python-modules/async_timeout { }; - - async_generator = callPackage ../development/python-modules/async_generator { }; - - async-upnp-client = callPackage ../development/python-modules/async-upnp-client { }; - - asn1ate = callPackage ../development/python-modules/asn1ate { }; - - atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { }; - - atomiclong = callPackage ../development/python-modules/atomiclong { }; - - atomicwrites = callPackage ../development/python-modules/atomicwrites { }; - - astroid = if isPy3k then callPackage ../development/python-modules/astroid { } - else callPackage ../development/python-modules/astroid/1.6.nix { }; - - attrdict = callPackage ../development/python-modules/attrdict { }; - - attrs = callPackage ../development/python-modules/attrs { }; - - atsim_potentials = callPackage ../development/python-modules/atsim_potentials { }; - - audio-metadata = callPackage ../development/python-modules/audio-metadata { }; - - audioread = callPackage ../development/python-modules/audioread { }; - - audiotools = callPackage ../development/python-modules/audiotools { }; - - autopep8 = callPackage ../development/python-modules/autopep8 { }; - - av = callPackage ../development/python-modules/av { - inherit (pkgs) pkgconfig; - }; - - avro = callPackage ../development/python-modules/avro {}; - - avro3k = callPackage ../development/python-modules/avro3k {}; - - avro-python3 = callPackage ../development/python-modules/avro-python3 {}; - - aws-lambda-builders = callPackage ../development/python-modules/aws-lambda-builders { }; - - python-slugify = callPackage ../development/python-modules/python-slugify { }; - - awesome-slugify = callPackage ../development/python-modules/awesome-slugify {}; - - noise = callPackage ../development/python-modules/noise {}; + babelgladeextractor = callPackage ../development/python-modules/babelgladeextractor { }; backcall = callPackage ../development/python-modules/backcall { }; @@ -2007,46 +715,78 @@ in { backports_abc = callPackage ../development/python-modules/backports_abc { }; + backports_csv = callPackage ../development/python-modules/backports_csv { }; + backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; + backports_lzma = callPackage ../development/python-modules/backports_lzma { }; + backports_os = callPackage ../development/python-modules/backports_os { }; backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { }; - backports_ssl_match_hostname = if !(pythonOlder "3.5") then null else - callPackage ../development/python-modules/backports_ssl_match_hostname { }; + backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which { }; - backports_lzma = callPackage ../development/python-modules/backports_lzma { }; + backports_ssl_match_hostname = + if !(pythonOlder "3.5") then null else callPackage ../development/python-modules/backports_ssl_match_hostname { }; backports_tempfile = callPackage ../development/python-modules/backports_tempfile { }; - backports_unittest-mock = callPackage ../development/python-modules/backports_unittest-mock {}; + backports_unittest-mock = callPackage ../development/python-modules/backports_unittest-mock { }; - babelfish = callPackage ../development/python-modules/babelfish {}; + backports_weakref = callPackage ../development/python-modules/backports_weakref { }; - bandit = callPackage ../development/python-modules/bandit {}; + bacpypes = callPackage ../development/python-modules/bacpypes { }; - basiciw = callPackage ../development/python-modules/basiciw { - inherit (pkgs) gcc wirelesstools; - }; + bandit = callPackage ../development/python-modules/bandit { }; - base58 = callPackage ../development/python-modules/base58 {}; + bap = callPackage ../development/python-modules/bap { bap = pkgs.ocaml-ng.ocamlPackages_4_06.bap; }; + + base58 = callPackage ../development/python-modules/base58 { }; + + baselines = callPackage ../development/python-modules/baselines { }; + + basemap = callPackage ../development/python-modules/basemap { }; + + bash_kernel = callPackage ../development/python-modules/bash_kernel { inherit (pkgs) bash; }; + + bashlex = callPackage ../development/python-modules/bashlex { }; + + basiciw = callPackage ../development/python-modules/basiciw { inherit (pkgs) gcc wirelesstools; }; batchgenerators = callPackage ../development/python-modules/batchgenerators { }; - batinfo = callPackage ../development/python-modules/batinfo {}; + batchspawner = callPackage ../development/python-modules/batchspawner { }; - bcdoc = callPackage ../development/python-modules/bcdoc {}; + batinfo = callPackage ../development/python-modules/batinfo { }; - beancount = callPackage ../development/python-modules/beancount { }; + bayesian-optimization = callPackage ../development/python-modules/bayesian-optimization { }; - beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; + bayespy = callPackage ../development/python-modules/bayespy { }; + + bcdoc = callPackage ../development/python-modules/bcdoc { }; + + bcrypt = callPackage ../development/python-modules/bcrypt { }; beaker = callPackage ../development/python-modules/beaker { }; + beancount = callPackage ../development/python-modules/beancount { }; + + beancount_docverif = callPackage ../development/python-modules/beancount_docverif { }; + + beanstalkc = callPackage ../development/python-modules/beanstalkc { }; + + beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; + + bedup = callPackage ../development/python-modules/bedup { }; + + behave = callPackage ../development/python-modules/behave { }; + + bellows = callPackage ../development/python-modules/bellows { }; + bespon = callPackage ../development/python-modules/bespon { }; - betamax = callPackage ../development/python-modules/betamax {}; + betamax = callPackage ../development/python-modules/betamax { }; betamax-matchers = callPackage ../development/python-modules/betamax-matchers { }; @@ -2058,6 +798,10 @@ in { bids-validator = callPackage ../development/python-modules/bids-validator { }; + billiard = callPackage ../development/python-modules/billiard { }; + + binaryornot = callPackage ../development/python-modules/binaryornot { }; + binwalk = callPackage ../development/python-modules/binwalk { pyqtgraph = null; matplotlib = null; @@ -2068,19 +812,69 @@ in { matplotlib = self.matplotlib; }); + biopython = callPackage ../development/python-modules/biopython { }; + + biplist = callPackage ../development/python-modules/biplist { }; + + bip_utils = callPackage ../development/python-modules/bip_utils { }; + + bitarray = callPackage ../development/python-modules/bitarray { }; + + bitbucket_api = callPackage ../development/python-modules/bitbucket-api { }; + + bitbucket-cli = callPackage ../development/python-modules/bitbucket-cli { }; + + bitcoinlib = callPackage ../development/python-modules/bitcoinlib { }; + + bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { }; + bitmath = callPackage ../development/python-modules/bitmath { }; + bitstring = callPackage ../development/python-modules/bitstring { }; + bitstruct = callPackage ../development/python-modules/bitstruct { }; - caldav = callPackage ../development/python-modules/caldav { }; + bjoern = callPackage ../development/python-modules/bjoern { }; - biopython = callPackage ../development/python-modules/biopython { }; + bkcharts = callPackage ../development/python-modules/bkcharts { }; - bedup = callPackage ../development/python-modules/bedup { }; + black = callPackage ../development/python-modules/black { }; - blessed = callPackage ../development/python-modules/blessed {}; + bleach = callPackage ../development/python-modules/bleach { }; - block-io = callPackage ../development/python-modules/block-io {}; + bleak = callPackage ../development/python-modules/bleak { }; + + blessed = callPackage ../development/python-modules/blessed { }; + + blessings = callPackage ../development/python-modules/blessings { }; + + blinker = callPackage ../development/python-modules/blinker { }; + + BlinkStick = callPackage ../development/python-modules/blinkstick { }; + + blis = callPackage ../development/python-modules/blis { }; + + blist = callPackage ../development/python-modules/blist { }; + + blivet = callPackage ../development/python-modules/blivet { }; + + blockdiag = callPackage ../development/python-modules/blockdiag { }; + + blockdiagcontrib-cisco = callPackage ../development/python-modules/blockdiagcontrib-cisco { }; + + block-io = callPackage ../development/python-modules/block-io { }; + + bluepy = callPackage ../development/python-modules/bluepy { }; + + bokeh = callPackage ../development/python-modules/bokeh { }; + + boltons = callPackage ../development/python-modules/boltons { }; + + boltztrap2 = callPackage ../development/python-modules/boltztrap2 { }; + + booleanoperations = callPackage ../development/python-modules/booleanoperations { }; + + boolean-py = callPackage ../development/python-modules/boolean-py { }; # Build boost for this specific Python version # TODO: use separate output for libboost_python.so @@ -2089,93 +883,461 @@ in { enablePython = true; }); - boltztrap2 = callPackage ../development/python-modules/boltztrap2 { }; + boto3 = callPackage ../development/python-modules/boto3 { }; - boolean-py = callPackage ../development/python-modules/boolean-py { }; + boto = callPackage ../development/python-modules/boto { }; - bumps = callPackage ../development/python-modules/bumps {}; + botocore = callPackage ../development/python-modules/botocore { }; - bx-python = callPackage ../development/python-modules/bx-python { - inherit (pkgs) zlib; - }; + bottle = callPackage ../development/python-modules/bottle { }; + + bottleneck = callPackage ../development/python-modules/bottleneck { }; + + box2d = callPackage ../development/python-modules/box2d { }; + + bpython = callPackage ../development/python-modules/bpython { }; + + braintree = callPackage ../development/python-modules/braintree { }; + + branca = callPackage ../development/python-modules/branca { }; + + bravado-core = callPackage ../development/python-modules/bravado-core { }; + + bravia-tv = callPackage ../development/python-modules/bravia-tv { }; + + breathe = callPackage ../development/python-modules/breathe { }; + + breezy = callPackage ../development/python-modules/breezy { }; + + broadlink = callPackage ../development/python-modules/broadlink { }; + + brother = callPackage ../development/python-modules/brother { }; + + brotli = callPackage ../development/python-modules/brotli { }; + + brotlipy = callPackage ../development/python-modules/brotlipy { }; + + browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { }; + + browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy { }); + + bsddb3 = callPackage ../development/python-modules/bsddb3 { }; + + bsdiff4 = callPackage ../development/python-modules/bsdiff4 { }; + + btchip = callPackage ../development/python-modules/btchip { }; + + bt_proximity = callPackage ../development/python-modules/bt-proximity { }; + + BTrees = callPackage ../development/python-modules/btrees { }; + + btrfs = callPackage ../development/python-modules/btrfs { }; + + bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 + + bugsnag = callPackage ../development/python-modules/bugsnag { }; + + bugwarrior = callPackage ../development/python-modules/bugwarrior { }; + + bugz = callPackage ../development/python-modules/bugz { }; + + bugzilla = callPackage ../development/python-modules/bugzilla { }; + + buildbot = callPackage ../development/python-modules/buildbot { }; + + buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]); + + buildbot-full = self.buildbot.withPlugins + (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]); + + buildbot-pkg = callPackage ../development/python-modules/buildbot/pkg.nix { }; + + buildbot-plugins = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/buildbot/plugins.nix { }); + + buildbot-worker = callPackage ../development/python-modules/buildbot/worker.nix { }; + + build = callPackage ../development/python-modules/build { }; + + bumps = callPackage ../development/python-modules/bumps { }; + + bunch = callPackage ../development/python-modules/bunch { }; + + bx-python = callPackage ../development/python-modules/bx-python { inherit (pkgs) zlib; }; + + bytecode = callPackage ../development/python-modules/bytecode { }; + + bz2file = callPackage ../development/python-modules/bz2file { }; + + cachecontrol = callPackage ../development/python-modules/cachecontrol { }; cached-property = callPackage ../development/python-modules/cached-property { }; + cachelib = callPackage ../development/python-modules/cachelib { }; + + cachetools = let + cachetools' = callPackage ../development/python-modules/cachetools { }; + cachetools_2 = cachetools'.overridePythonAttrs (oldAttrs: rec { + version = "3.1.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "16m69l6n6y1r1y7cklm92rr7v69ldig2n3lbl3j323w5jz7d78lf"; + }; + }); + in if isPy3k then cachetools' else cachetools_2; + + cachy = callPackage ../development/python-modules/cachy { }; + + cadquery = callPackage ../development/python-modules/cadquery { }; + caffe = toPythonModule (pkgs.caffe.override { pythonSupport = true; inherit (self) python numpy boost; }); + cairocffi = if isPy3k then + callPackage ../development/python-modules/cairocffi { } + else + callPackage ../development/python-modules/cairocffi/0_9.nix { }; + + cairosvg = if isPy3k then + callPackage ../development/python-modules/cairosvg { } + else + callPackage ../development/python-modules/cairosvg/1_x.nix { }; + + caldav = callPackage ../development/python-modules/caldav { }; + + can = callPackage ../development/python-modules/can { }; + + canmatrix = callPackage ../development/python-modules/canmatrix { }; + + canonicaljson = callPackage ../development/python-modules/canonicaljson { }; + + canopen = callPackage ../development/python-modules/canopen { }; + capstone = callPackage ../development/python-modules/capstone { inherit (pkgs) capstone; }; capturer = callPackage ../development/python-modules/capturer { }; - cement = callPackage ../development/python-modules/cement {}; + carbon = callPackage ../development/python-modules/carbon { }; + + carrot = callPackage ../development/python-modules/carrot { }; + + cartopy = callPackage ../development/python-modules/cartopy { }; + + casbin = callPackage ../development/python-modules/casbin { }; + + case = callPackage ../development/python-modules/case { }; + + cassandra-driver = callPackage ../development/python-modules/cassandra-driver { }; + + casttube = callPackage ../development/python-modules/casttube { }; + + catalogue = callPackage ../development/python-modules/catalogue { }; + + cbeams = callPackage ../misc/cbeams { }; + + cbor2 = callPackage ../development/python-modules/cbor2 { }; + + cbor = callPackage ../development/python-modules/cbor { }; + + cccolutils = callPackage ../development/python-modules/cccolutils { }; + + cchardet = callPackage ../development/python-modules/cchardet { }; + + CDDB = callPackage ../development/python-modules/cddb { }; + + cdecimal = callPackage ../development/python-modules/cdecimal { }; + + celery = callPackage ../development/python-modules/celery { }; + + cement = callPackage ../development/python-modules/cement { }; + + cerberus = callPackage ../development/python-modules/cerberus { }; + + certbot = callPackage ../development/python-modules/certbot { }; + + certbot-dns-cloudflare = callPackage ../development/python-modules/certbot-dns-cloudflare { }; + + certbot-dns-rfc2136 = callPackage ../development/python-modules/certbot-dns-rfc2136 { }; + + certbot-dns-route53 = callPackage ../development/python-modules/certbot-dns-route53 { }; + + certifi = callPackage ../development/python-modules/certifi { }; + + certipy = callPackage ../development/python-modules/certipy { }; + + cffi = callPackage ../development/python-modules/cffi { }; + + cfgv = callPackage ../development/python-modules/cfgv { }; + + cfn-flip = callPackage ../development/python-modules/cfn-flip { }; + + cfn-lint = callPackage ../development/python-modules/cfn-lint { }; + + cftime = callPackage ../development/python-modules/cftime { }; cgen = callPackage ../development/python-modules/cgen { }; - cgroup-utils = callPackage ../development/python-modules/cgroup-utils {}; + cgroup-utils = callPackage ../development/python-modules/cgroup-utils { }; - chainer = callPackage ../development/python-modules/chainer { - cudaSupport = pkgs.config.cudaSupport or false; - }; + chai = callPackage ../development/python-modules/chai { }; - channels = callPackage ../development/python-modules/channels {}; + chainer = callPackage ../development/python-modules/chainer { cudaSupport = pkgs.config.cudaSupport or false; }; - cheroot = callPackage ../development/python-modules/cheroot {}; + chainmap = callPackage ../development/python-modules/chainmap { }; - chevron = callPackage ../development/python-modules/chevron {}; + chalice = callPackage ../development/python-modules/chalice { }; + + chameleon = callPackage ../development/python-modules/chameleon { }; + + channels = callPackage ../development/python-modules/channels { }; + + channels-redis = callPackage ../development/python-modules/channels-redis { }; + + characteristic = callPackage ../development/python-modules/characteristic { }; + + chardet = callPackage ../development/python-modules/chardet { }; + + chart-studio = callPackage ../development/python-modules/chart-studio { }; + + check-manifest = callPackage ../development/python-modules/check-manifest { }; + + cheetah3 = callPackage ../development/python-modules/cheetah3 { }; + + cheetah = callPackage ../development/python-modules/cheetah { }; + + cheroot = callPackage ../development/python-modules/cheroot { }; + + cherrypy = if isPy3k then + callPackage ../development/python-modules/cherrypy { } + else + callPackage ../development/python-modules/cherrypy/17.nix { }; + + chevron = callPackage ../development/python-modules/chevron { }; ci-info = callPackage ../development/python-modules/ci-info { }; ci-py = callPackage ../development/python-modules/ci-py { }; - cli-helpers = callPackage ../development/python-modules/cli-helpers {}; - - cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; - cirq = callPackage ../development/python-modules/cirq { }; + ciso8601 = callPackage ../development/python-modules/ciso8601 { }; + citeproc-py = callPackage ../development/python-modules/citeproc-py { }; + cjson = callPackage ../development/python-modules/cjson { }; + + ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; + + cld2-cffi = callPackage ../development/python-modules/cld2-cffi { }; + + cleo = callPackage ../development/python-modules/cleo { }; + + clf = callPackage ../development/python-modules/clf { }; + + cliapp = callPackage ../development/python-modules/cliapp { }; + + click = callPackage ../development/python-modules/click { }; + + clickclick = callPackage ../development/python-modules/clickclick { }; + + click-completion = callPackage ../development/python-modules/click-completion { }; + + click-datetime = callPackage ../development/python-modules/click-datetime { }; + + click-default-group = callPackage ../development/python-modules/click-default-group { }; + + click-didyoumean = callPackage ../development/python-modules/click-didyoumean { }; + + click-log = callPackage ../development/python-modules/click-log { }; + + click-plugins = callPackage ../development/python-modules/click-plugins { }; + + click-repl = callPackage ../development/python-modules/click-repl { }; + + click-threading = callPackage ../development/python-modules/click-threading { }; + + cliff = callPackage ../development/python-modules/cliff { }; + + clifford = callPackage ../development/python-modules/clifford { }; + + cligj = callPackage ../development/python-modules/cligj { }; + + cli-helpers = callPackage ../development/python-modules/cli-helpers { }; + + clikit = callPackage ../development/python-modules/clikit { }; + + clint = callPackage ../development/python-modules/clint { }; + + clize = callPackage ../development/python-modules/clize { }; + + closure-linter = callPackage ../development/python-modules/closure-linter { }; + + cloudflare = callPackage ../development/python-modules/cloudflare { }; + + cloudpickle = callPackage ../development/python-modules/cloudpickle { }; + + clustershell = callPackage ../development/python-modules/clustershell { }; + + cma = callPackage ../development/python-modules/cma { }; + + cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; + + cmd2 = callPackage ../development/python-modules/cmd2 { }; + + cmdline = callPackage ../development/python-modules/cmdline { }; + + cmdtest = callPackage ../development/python-modules/cmdtest { }; + + cntk = callPackage ../development/python-modules/cntk { }; + + cnvkit = callPackage ../development/python-modules/cnvkit { }; + + cocotb = callPackage ../development/python-modules/cocotb { }; + + codecov = callPackage ../development/python-modules/codecov { }; + + codespell = callPackage ../development/python-modules/codespell { }; + + cogapp = callPackage ../development/python-modules/cogapp { }; + + coilmq = callPackage ../development/python-modules/coilmq { }; + + coinmarketcap = callPackage ../development/python-modules/coinmarketcap { }; + + ColanderAlchemy = callPackage ../development/python-modules/colanderalchemy { }; + + colander = callPackage ../development/python-modules/colander { }; + + colorama = callPackage ../development/python-modules/colorama { }; + colorcet = callPackage ../development/python-modules/colorcet { }; + colorclass = callPackage ../development/python-modules/colorclass { }; + + colored = callPackage ../development/python-modules/colored { }; + coloredlogs = callPackage ../development/python-modules/coloredlogs { }; - colorclass = callPackage ../development/python-modules/colorclass {}; - - colorful = callPackage ../development/python-modules/colorful {}; + colorful = callPackage ../development/python-modules/colorful { }; colorlog = callPackage ../development/python-modules/colorlog { }; + colorlover = callPackage ../development/python-modules/colorlover { }; + + colormath = callPackage ../development/python-modules/colormath { }; + colorspacious = callPackage ../development/python-modules/colorspacious { }; - colour = callPackage ../development/python-modules/colour {}; + colour = callPackage ../development/python-modules/colour { }; - colormath = callPackage ../development/python-modules/colormath {}; + CommonMark = callPackage ../development/python-modules/commonmark { }; + + compiledb = callPackage ../development/python-modules/compiledb { }; + + conda = callPackage ../development/python-modules/conda { }; + + ConfigArgParse = callPackage ../development/python-modules/configargparse { }; + + configobj = callPackage ../development/python-modules/configobj { }; + + configparser = if pythonOlder "3.6" then + callPackage ../development/python-modules/configparser/4.nix { } + else + callPackage ../development/python-modules/configparser { }; configshell = callPackage ../development/python-modules/configshell { }; + confluent-kafka = callPackage ../development/python-modules/confluent-kafka { }; + + connexion = callPackage ../development/python-modules/connexion { }; + consonance = callPackage ../development/python-modules/consonance { }; constantly = callPackage ../development/python-modules/constantly { }; + construct = callPackage ../development/python-modules/construct { }; + + consul = callPackage ../development/python-modules/consul { }; + + contexter = callPackage ../development/python-modules/contexter { }; + + contextlib2 = callPackage ../development/python-modules/contextlib2 { }; + + contextvars = callPackage ../development/python-modules/contextvars { }; + + convertdate = callPackage ../development/python-modules/convertdate { }; + + cookiecutter = callPackage ../development/python-modules/cookiecutter { }; + + cookies = callPackage ../development/python-modules/cookies { }; + + coordinates = callPackage ../development/python-modules/coordinates { }; + + coreapi = callPackage ../development/python-modules/coreapi { }; + + coreschema = callPackage ../development/python-modules/coreschema { }; + cornice = callPackage ../development/python-modules/cornice { }; - crashtest = callPackage ../development/python-modules/crashtest { }; + cot = callPackage ../development/python-modules/cot { }; + + covCore = callPackage ../development/python-modules/cov-core { }; + + coverage = callPackage ../development/python-modules/coverage { }; + + coveralls = callPackage ../development/python-modules/coveralls { }; + + cozy = callPackage ../development/python-modules/cozy { }; + + cppy = callPackage ../development/python-modules/cppy { }; cram = callPackage ../development/python-modules/cram { }; + crashtest = callPackage ../development/python-modules/crashtest { }; + + crayons = callPackage ../development/python-modules/crayons { }; + crc16 = callPackage ../development/python-modules/crc16 { }; + crc32c = callPackage ../development/python-modules/crc32c { }; + crccheck = callPackage ../development/python-modules/crccheck { }; + crcmod = callPackage ../development/python-modules/crcmod { }; + + credstash = callPackage ../development/python-modules/credstash { }; + croniter = callPackage ../development/python-modules/croniter { }; - csscompressor = callPackage ../development/python-modules/csscompressor {}; + cryptacular = callPackage ../development/python-modules/cryptacular { }; + + cryptography = if isPy27 then + callPackage ../development/python-modules/cryptography/2.9.nix { } + else + callPackage ../development/python-modules/cryptography { }; + + cryptography_vectors = if isPy27 then + callPackage ../development/python-modules/cryptography/vectors-2.9.nix { } + else + callPackage ../development/python-modules/cryptography/vectors.nix { }; + + csscompressor = callPackage ../development/python-modules/csscompressor { }; + + cssmin = callPackage ../development/python-modules/cssmin { }; + + css-parser = callPackage ../development/python-modules/css-parser { }; + + cssselect2 = callPackage ../development/python-modules/cssselect2 { }; + + cssselect = callPackage ../development/python-modules/cssselect { }; + + cssutils = callPackage ../development/python-modules/cssutils { }; csvs-to-sqlite = callPackage ../development/python-modules/csvs-to-sqlite { }; + cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { }; + cufflinks = callPackage ../development/python-modules/cufflinks { }; cupy = callPackage ../development/python-modules/cupy { @@ -2184,627 +1346,55 @@ in { nccl = pkgs.nccl_cudatoolkit_10; }; - cx_Freeze = callPackage ../development/python-modules/cx_freeze {}; + curio = callPackage ../development/python-modules/curio { }; - cx_oracle = callPackage ../development/python-modules/cx_oracle {}; + curtsies = callPackage ../development/python-modules/curtsies { }; + + curve25519-donna = callPackage ../development/python-modules/curve25519-donna { }; cvxopt = callPackage ../development/python-modules/cvxopt { }; cvxpy = callPackage ../development/python-modules/cvxpy { }; + cx_Freeze = callPackage ../development/python-modules/cx_freeze { }; + + cx_oracle = callPackage ../development/python-modules/cx_oracle { }; + cycler = callPackage ../development/python-modules/cycler { }; - cysignals = callPackage ../development/python-modules/cysignals { }; + cymem = callPackage ../development/python-modules/cymem { }; cypari2 = callPackage ../development/python-modules/cypari2 { }; - dlib = callPackage ../development/python-modules/dlib { - inherit (pkgs) dlib; - }; - - datadog = callPackage ../development/python-modules/datadog {}; - - dataclasses = callPackage ../development/python-modules/dataclasses { }; - - dataclasses-json = callPackage ../development/python-modules/dataclasses-json { }; - - debian = callPackage ../development/python-modules/debian {}; - - defusedxml = callPackage ../development/python-modules/defusedxml {}; - - dodgy = callPackage ../development/python-modules/dodgy { }; - - duecredit = callPackage ../development/python-modules/duecredit { }; - - dugong = callPackage ../development/python-modules/dugong {}; - - easysnmp = callPackage ../development/python-modules/easysnmp { - openssl = pkgs.openssl; - net-snmp = pkgs.net-snmp; - }; - - iowait = callPackage ../development/python-modules/iowait {}; - - responses = callPackage ../development/python-modules/responses {}; - - rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; }; - - proboscis = callPackage ../development/python-modules/proboscis {}; - - poster3 = callPackage ../development/python-modules/poster3 { }; - - py4j = callPackage ../development/python-modules/py4j { }; - - pyechonest = callPackage ../development/python-modules/pyechonest { }; - - pyepsg = callPackage ../development/python-modules/pyepsg { }; - - billiard = callPackage ../development/python-modules/billiard { }; - - binaryornot = callPackage ../development/python-modules/binaryornot { }; - - bitbucket_api = callPackage ../development/python-modules/bitbucket-api { }; - - bitbucket-cli = callPackage ../development/python-modules/bitbucket-cli { }; - - bitstring = callPackage ../development/python-modules/bitstring { }; - - html5-parser = callPackage ../development/python-modules/html5-parser { - inherit (pkgs) pkgconfig; - }; - - HTSeq = callPackage ../development/python-modules/HTSeq { }; - - httpserver = callPackage ../development/python-modules/httpserver {}; - - bleach = callPackage ../development/python-modules/bleach { }; - - bleak = callPackage ../development/python-modules/bleak { }; - - blinker = callPackage ../development/python-modules/blinker { }; - - blockdiag = callPackage ../development/python-modules/blockdiag { }; - - blockdiagcontrib-cisco = callPackage ../development/python-modules/blockdiagcontrib-cisco { }; - - bpython = callPackage ../development/python-modules/bpython {}; - - bsddb3 = callPackage ../development/python-modules/bsddb3 { }; - - bsdiff4 = callPackage ../development/python-modules/bsdiff4 { }; - - bkcharts = callPackage ../development/python-modules/bkcharts { }; - - bokeh = callPackage ../development/python-modules/bokeh { }; - - boto = callPackage ../development/python-modules/boto { }; - - boto3 = callPackage ../development/python-modules/boto3 { }; - - botocore = callPackage ../development/python-modules/botocore { }; - - bottle = callPackage ../development/python-modules/bottle { }; - - box2d = callPackage ../development/python-modules/box2d { }; - - branca = callPackage ../development/python-modules/branca { }; - - bugwarrior = callPackage ../development/python-modules/bugwarrior { }; - - bugz = callPackage ../development/python-modules/bugz { }; - - bugzilla = callPackage ../development/python-modules/bugzilla { }; - - buildbot = callPackage ../development/python-modules/buildbot { }; - buildbot-plugins = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/buildbot/plugins.nix { }); - buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]); - buildbot-full = self.buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]); - buildbot-worker = callPackage ../development/python-modules/buildbot/worker.nix { }; - buildbot-pkg = callPackage ../development/python-modules/buildbot/pkg.nix { }; - - check-manifest = callPackage ../development/python-modules/check-manifest { }; - - devpi-common = callPackage ../development/python-modules/devpi-common { }; - # A patched version of buildout, useful for buildout based development on Nix - zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; - - zc_buildout = self.zc_buildout221; - - zc_buildout221 = callPackage ../development/python-modules/buildout { }; - - z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { }; - - bunch = callPackage ../development/python-modules/bunch { }; - - can = callPackage ../development/python-modules/can {}; - - canopen = callPackage ../development/python-modules/canopen {}; - - canmatrix = callPackage ../development/python-modules/canmatrix {}; - - - cairocffi = if isPy3k then - callPackage ../development/python-modules/cairocffi {} - else - callPackage ../development/python-modules/cairocffi/0_9.nix {}; - - cairosvg = if isPy3k then - callPackage ../development/python-modules/cairosvg {} - else - callPackage ../development/python-modules/cairosvg/1_x.nix {}; - - carrot = callPackage ../development/python-modules/carrot {}; - - cartopy = callPackage ../development/python-modules/cartopy {}; - - casbin = callPackage ../development/python-modules/casbin { }; - - case = callPackage ../development/python-modules/case {}; - - cbor = callPackage ../development/python-modules/cbor {}; - - cbor2 = callPackage ../development/python-modules/cbor2 {}; - - cassandra-driver = callPackage ../development/python-modules/cassandra-driver { }; - - cccolutils = callPackage ../development/python-modules/cccolutils {}; - - cchardet = callPackage ../development/python-modules/cchardet { }; - - CDDB = callPackage ../development/python-modules/cddb { }; - - cntk = callPackage ../development/python-modules/cntk { }; - - celery = callPackage ../development/python-modules/celery { }; - - cerberus = callPackage ../development/python-modules/cerberus { }; - - certifi = callPackage ../development/python-modules/certifi { }; - - certipy = callPackage ../development/python-modules/certipy {}; - - characteristic = callPackage ../development/python-modules/characteristic { }; - - chart-studio = callPackage ../development/python-modules/chart-studio { }; - - cheetah = callPackage ../development/python-modules/cheetah { }; - - cheetah3 = callPackage ../development/python-modules/cheetah3 { }; - - cherrypy = if isPy3k then - callPackage ../development/python-modules/cherrypy { } - else - callPackage ../development/python-modules/cherrypy/17.nix { }; - - cfgv = callPackage ../development/python-modules/cfgv { }; - - cfn-lint = callPackage ../development/python-modules/cfn-lint { }; - - cftime = callPackage ../development/python-modules/cftime {}; - - cjson = callPackage ../development/python-modules/cjson { }; - - cld2-cffi = callPackage ../development/python-modules/cld2-cffi {}; - - clf = callPackage ../development/python-modules/clf {}; - - click = callPackage ../development/python-modules/click {}; - - click-completion = callPackage ../development/python-modules/click-completion {}; - - click-datetime = callPackage ../development/python-modules/click-datetime { }; - - click-default-group = callPackage ../development/python-modules/click-default-group { }; - - click-didyoumean = callPackage ../development/python-modules/click-didyoumean {}; - - click-log = callPackage ../development/python-modules/click-log {}; - - click-plugins = callPackage ../development/python-modules/click-plugins {}; - - click-repl = callPackage ../development/python-modules/click-repl { }; - - click-threading = callPackage ../development/python-modules/click-threading {}; - - cligj = callPackage ../development/python-modules/cligj { }; - - closure-linter = callPackage ../development/python-modules/closure-linter { }; - - cloudflare = callPackage ../development/python-modules/cloudflare { }; - - cloudpickle = callPackage ../development/python-modules/cloudpickle { }; - - cmdline = callPackage ../development/python-modules/cmdline { }; - - codecov = callPackage ../development/python-modules/codecov {}; - - cogapp = callPackage ../development/python-modules/cogapp {}; - - colorama = callPackage ../development/python-modules/colorama { }; - - colorlover = callPackage ../development/python-modules/colorlover { }; - - CommonMark = callPackage ../development/python-modules/commonmark { }; - - coilmq = callPackage ../development/python-modules/coilmq { }; - - colander = callPackage ../development/python-modules/colander { }; - - # Backported version of the ConfigParser library of Python 3.3 - configparser = if pythonOlder "3.6" then - callPackage ../development/python-modules/configparser/4.nix { } - else - callPackage ../development/python-modules/configparser { }; - - ColanderAlchemy = callPackage ../development/python-modules/colanderalchemy { }; - - conda = callPackage ../development/python-modules/conda { }; - - configobj = callPackage ../development/python-modules/configobj { }; - - confluent-kafka = callPackage ../development/python-modules/confluent-kafka {}; - - kafka-python = callPackage ../development/python-modules/kafka-python {}; - - construct = callPackage ../development/python-modules/construct {}; - - consul = callPackage ../development/python-modules/consul { }; - - contexter = callPackage ../development/python-modules/contexter { }; - - contextvars = callPackage ../development/python-modules/contextvars {}; - - contextlib2 = callPackage ../development/python-modules/contextlib2 { }; - - cookiecutter = callPackage ../development/python-modules/cookiecutter { }; - - cookies = callPackage ../development/python-modules/cookies { }; - - coreapi = callPackage ../development/python-modules/coreapi { }; - - coreschema = callPackage ../development/python-modules/coreschema { }; - - coveralls = callPackage ../development/python-modules/coveralls { }; - - coverage = callPackage ../development/python-modules/coverage { }; - - covCore = callPackage ../development/python-modules/cov-core { }; - - crcmod = callPackage ../development/python-modules/crcmod { }; - - credstash = callPackage ../development/python-modules/credstash { }; + cysignals = callPackage ../development/python-modules/cysignals { }; cython = callPackage ../development/python-modules/Cython { }; cytoolz = callPackage ../development/python-modules/cytoolz { }; - cppy = callPackage ../development/python-modules/cppy { }; + d2to1 = callPackage ../development/python-modules/d2to1 { }; - cryptacular = callPackage ../development/python-modules/cryptacular { }; + daemonize = callPackage ../development/python-modules/daemonize { }; - cryptography = if isPy27 then - callPackage ../development/python-modules/cryptography/2.9.nix { } - else - callPackage ../development/python-modules/cryptography { }; - - cryptography_vectors = if isPy27 then - callPackage ../development/python-modules/cryptography/vectors-2.9.nix { } - else - callPackage ../development/python-modules/cryptography/vectors.nix { }; - - curtsies = callPackage ../development/python-modules/curtsies { }; - - envs = callPackage ../development/python-modules/envs { }; - - enaml = callPackage ../development/python-modules/enaml { }; - - enamlx = callPackage ../development/python-modules/enamlx { }; - - etelemetry = callPackage ../development/python-modules/etelemetry { }; - - eth-hash = callPackage ../development/python-modules/eth-hash { }; - - eth-typing = callPackage ../development/python-modules/eth-typing { }; - - eth-utils = callPackage ../development/python-modules/eth-utils { }; - - gwyddion = disabledIf isPy3k (toPythonModule (pkgs.gwyddion.override { - pythonSupport = true; - pythonPackages = self; - })); - - impacket = callPackage ../development/python-modules/impacket { }; - - img2pdf = callPackage ../development/python-modules/img2pdf { }; - - jsonlines = callPackage ../development/python-modules/jsonlines { }; - - json-merge-patch = callPackage ../development/python-modules/json-merge-patch { }; - - jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { }; - - jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { }; - - jsonrpc-websocket = callPackage ../development/python-modules/jsonrpc-websocket { }; - - hepmc3 = toPythonModule (pkgs.hepmc3.override { - inherit python; - }); - - onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { }; - - tablib = callPackage ../development/python-modules/tablib { }; - - wakeonlan = callPackage ../development/python-modules/wakeonlan { }; - - openant = callPackage ../development/python-modules/openant { }; - - opencv = disabledIf isPy3k (toPythonModule (pkgs.opencv.override { - enablePython = true; - pythonPackages = self; - })); - - opencv3 = toPythonModule (pkgs.opencv3.override { - enablePython = true; - pythonPackages = self; - }); - - opencv4 = toPythonModule (pkgs.opencv4.override { - enablePython = true; - pythonPackages = self; - }); - - opentracing = callPackage ../development/python-modules/opentracing { }; - - openidc-client = callPackage ../development/python-modules/openidc-client {}; - - openwebifpy = callPackage ../development/python-modules/openwebifpy {}; - - optuna = callPackage ../development/python-modules/optuna { }; - - idna = callPackage ../development/python-modules/idna { }; - - mahotas = callPackage ../development/python-modules/mahotas { }; - - MDP = callPackage ../development/python-modules/mdp {}; - - minidb = callPackage ../development/python-modules/minidb { }; - - miniupnpc = callPackage ../development/python-modules/miniupnpc {}; - - mixpanel = callPackage ../development/python-modules/mixpanel { }; - - mpyq = callPackage ../development/python-modules/mpyq { }; - - mxnet = callPackage ../development/python-modules/mxnet { }; - - nplusone = callPackage ../development/python-modules/nplusone { }; - - parsy = callPackage ../development/python-modules/parsy { }; - - portalocker = callPackage ../development/python-modules/portalocker { }; - - portpicker = callPackage ../development/python-modules/portpicker { }; - - pkginfo = callPackage ../development/python-modules/pkginfo { }; - - pre-commit = callPackage ../development/python-modules/pre-commit { }; - - pretend = callPackage ../development/python-modules/pretend { }; - - detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 - - pbkdf2 = callPackage ../development/python-modules/pbkdf2 { }; - - bcrypt = callPackage ../development/python-modules/bcrypt { }; - - cffi = callPackage ../development/python-modules/cffi { }; - - pyavm = callPackage ../development/python-modules/pyavm { }; - - pycollada = callPackage ../development/python-modules/pycollada { }; - - pycontracts = callPackage ../development/python-modules/pycontracts { }; - - pycparser = callPackage ../development/python-modules/pycparser { }; - - pydub = callPackage ../development/python-modules/pydub {}; - - pyjade = callPackage ../development/python-modules/pyjade {}; - - pyjet = callPackage ../development/python-modules/pyjet {}; - - pyjks = callPackage ../development/python-modules/pyjks {}; - - PyLD = callPackage ../development/python-modules/PyLD { }; - - pysingleton = callPackage ../development/python-modules/pysingleton { }; - - python-didl-lite = callPackage ../development/python-modules/python-didl-lite { }; - - python-jose = callPackage ../development/python-modules/python-jose {}; - - python-json-logger = callPackage ../development/python-modules/python-json-logger { }; - - python-ly = callPackage ../development/python-modules/python-ly {}; - - pyhcl = callPackage ../development/python-modules/pyhcl { }; - - pyhs100 = callPackage ../development/python-modules/pyhs100 { }; - - pyrealsense2 = toPythonModule (pkgs.librealsense.override { - enablePython = true; - pythonPackages = self; - }); - - pyrealsense2WithCuda = toPythonModule (pkgs.librealsenseWithCuda.override { - enablePython = true; - pythonPackages = self; - }); - - pyrealsense2WithoutCuda = toPythonModule (pkgs.librealsenseWithoutCuda.override { - enablePython = true; - pythonPackages = self; - }); - - # pytest>=6 is too new for most packages - pytest = if isPy3k then self.pytest_5 else self.pytest_4; - - pytest_6 = callPackage ../development/python-modules/pytest { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; - }; - - pytest_5 = callPackage ../development/python-modules/pytest/5.nix { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; - }; - - pytest_4 = callPackage ../development/python-modules/pytest/4.nix { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; - }; - - pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { }; - - pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; - - pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { }; - - pytest-annotate = callPackage ../development/python-modules/pytest-annotate { }; - - pytest-ansible = callPackage ../development/python-modules/pytest-ansible { }; - - pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; - - pytest-arraydiff = callPackage ../development/python-modules/pytest-arraydiff { }; - - pytest-astropy = callPackage ../development/python-modules/pytest-astropy { }; - - pytest-astropy-header = callPackage ../development/python-modules/pytest-astropy-header { }; - - pytest-filter-subpackage = callPackage ../development/python-modules/pytest-filter-subpackage { }; - - pytest-benchmark = callPackage ../development/python-modules/pytest-benchmark { }; - - pytestcache = callPackage ../development/python-modules/pytestcache { }; - - pytest-catchlog = callPackage ../development/python-modules/pytest-catchlog { }; - - pytest-cram = callPackage ../development/python-modules/pytest-cram { }; - - pytest-datadir = callPackage ../development/python-modules/pytest-datadir { }; - - pytest-datafiles = callPackage ../development/python-modules/pytest-datafiles { }; - - pytest-dependency = callPackage ../development/python-modules/pytest-dependency { }; - - pytest-django = callPackage ../development/python-modules/pytest-django { }; - - pytest-doctestplus = callPackage ../development/python-modules/pytest-doctestplus { }; - - pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { }; - - pytest-forked = callPackage ../development/python-modules/pytest-forked { }; - - pytest-html = callPackage ../development/python-modules/pytest-html { }; - - pytest-metadata = callPackage ../development/python-modules/pytest-metadata { }; - - pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; - - pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { }; - - pytest-remotedata = callPackage ../development/python-modules/pytest-remotedata { }; - - pytest-sanic = callPackage ../development/python-modules/pytest-sanic { }; - - pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { }; - - pytest-flakes = callPackage ../development/python-modules/pytest-flakes { }; - - pytest-isort = callPackage ../development/python-modules/pytest-isort { }; - - pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { }; - - pytest-mpl = callPackage ../development/python-modules/pytest-mpl { }; - - pytest-mock = if isPy3k then - callPackage ../development/python-modules/pytest-mock { } - else - callPackage ../development/python-modules/pytest-mock/2.nix { }; - - pytest-openfiles = callPackage ../development/python-modules/pytest-openfiles { }; - - pytest-timeout = callPackage ../development/python-modules/pytest-timeout { }; - - pytest-warnings = callPackage ../development/python-modules/pytest-warnings { }; - - pytest-watch = callPackage ../development/python-modules/pytest-watch { }; - - pytestpep8 = callPackage ../development/python-modules/pytest-pep8 { }; - - pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; - - pytest-pythonpath = callPackage ../development/python-modules/pytest-pythonpath { }; - - pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { }; - - pytest-random-order = callPackage ../development/python-modules/pytest-random-order { }; - - pytest-repeat = callPackage ../development/python-modules/pytest-repeat { }; - - pytestrunner = callPackage ../development/python-modules/pytestrunner { }; - - pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; - - pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { }; - - pytest-services = callPackage ../development/python-modules/pytest-services { }; - - pytest-shutil = callPackage ../development/python-modules/pytest-shutil { }; - - pytest-socket = callPackage ../development/python-modules/pytest-socket { }; - - pytestcov = callPackage ../development/python-modules/pytest-cov { }; - - pytest-expect = callPackage ../development/python-modules/pytest-expect { }; - - pytest-virtualenv = callPackage ../development/python-modules/pytest-virtualenv { }; - - pytest_xdist = self.pytest_xdist_1; - - pytest_xdist_1 = callPackage ../development/python-modules/pytest-xdist { }; - - pytest_xdist_2 = callPackage ../development/python-modules/pytest-xdist/2.nix { }; - - pytest-localserver = callPackage ../development/python-modules/pytest-localserver { }; - - pytest-subtesthack = callPackage ../development/python-modules/pytest-subtesthack { }; - - pytest-sugar = callPackage ../development/python-modules/pytest-sugar { }; - - tinycss = callPackage ../development/python-modules/tinycss { }; - - tinycss2 = callPackage ../development/python-modules/tinycss2 { }; - - cssselect = callPackage ../development/python-modules/cssselect { }; - - cssselect2 = callPackage ../development/python-modules/cssselect2 { }; - - cssutils = callPackage ../development/python-modules/cssutils { }; - - css-parser = callPackage ../development/python-modules/css-parser { }; + daphne = callPackage ../development/python-modules/daphne { }; darcsver = callPackage ../development/python-modules/darcsver { }; + dash = callPackage ../development/python-modules/dash { }; + + dash-core-components = callPackage ../development/python-modules/dash-core-components { }; + + dash-html-components = callPackage ../development/python-modules/dash-html-components { }; + + dash-renderer = callPackage ../development/python-modules/dash-renderer { }; + + dash-table = callPackage ../development/python-modules/dash-table { }; + dask = callPackage ../development/python-modules/dask { }; dask-gateway = callPackage ../development/python-modules/dask-gateway { }; - dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { - inherit (pkgs) go; - }; + dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { inherit (pkgs) go; }; dask-glm = callPackage ../development/python-modules/dask-glm { }; @@ -2818,967 +1408,160 @@ in { dask-xgboost = callPackage ../development/python-modules/dask-xgboost { }; - datrie = callPackage ../development/python-modules/datrie { }; + databases = callPackage ../development/python-modules/databases { }; - heapdict = callPackage ../development/python-modules/heapdict { }; + databricks-cli = callPackage ../development/python-modules/databricks-cli { }; - zict = callPackage ../development/python-modules/zict { }; + dataclasses = callPackage ../development/python-modules/dataclasses { }; - zigpy = callPackage ../development/python-modules/zigpy { }; + dataclasses-json = callPackage ../development/python-modules/dataclasses-json { }; - zigpy-cc = callPackage ../development/python-modules/zigpy-cc { }; + datadiff = callPackage ../development/python-modules/datadiff { }; - zigpy-deconz = callPackage ../development/python-modules/zigpy-deconz { }; + datadog = callPackage ../development/python-modules/datadog { }; - zigpy-xbee = callPackage ../development/python-modules/zigpy-xbee { }; + datamodeldict = callPackage ../development/python-modules/datamodeldict { }; - zigpy-zigate = callPackage ../development/python-modules/zigpy-zigate { }; + datasette = callPackage ../development/python-modules/datasette { }; - digital-ocean = callPackage ../development/python-modules/digitalocean { }; - - digi-xbee = callPackage ../development/python-modules/digi-xbee { }; - - leather = callPackage ../development/python-modules/leather { }; - - libais = callPackage ../development/python-modules/libais { }; - - libevdev = callPackage ../development/python-modules/libevdev { }; - - libfdt = toPythonModule (pkgs.dtc.override { - inherit python; - pythonSupport = true; - }); - - libtmux = callPackage ../development/python-modules/libtmux { }; - - libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; }; - - linuxfd = callPackage ../development/python-modules/linuxfd { }; - - locket = callPackage ../development/python-modules/locket { }; - - loo-py = callPackage ../development/python-modules/loo-py { }; - - tblib = callPackage ../development/python-modules/tblib { }; - - s3fs = callPackage ../development/python-modules/s3fs { }; + datashader = callPackage ../development/python-modules/datashader { }; datashape = callPackage ../development/python-modules/datashape { }; - requests-cache = callPackage ../development/python-modules/requests-cache { }; - - requests-file = callPackage ../development/python-modules/requests-file { }; - - requests-kerberos = callPackage ../development/python-modules/requests-kerberos { }; - - requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket {}; - - requests-aws4auth = callPackage ../development/python-modules/requests-aws4auth { }; - - howdoi = callPackage ../development/python-modules/howdoi {}; - - jdatetime = callPackage ../development/python-modules/jdatetime {}; - - daphne = callPackage ../development/python-modules/daphne { }; - - dash = callPackage ../development/python-modules/dash { }; - - dash-core-components = callPackage ../development/python-modules/dash-core-components { }; - - dash-html-components = callPackage ../development/python-modules/dash-html-components { }; - - dash-renderer = callPackage ../development/python-modules/dash-renderer { }; - - dash-table = callPackage ../development/python-modules/dash-table { }; + datatable = + callPackage ../development/python-modules/datatable { inherit (pkgs.llvmPackages) openmp libcxx libcxxabi; }; dateparser = callPackage ../development/python-modules/dateparser { }; - # Actual name of package - python-dateutil = callPackage ../development/python-modules/dateutil { }; - # Alias that we should deprecate - dateutil = self.python-dateutil; + datrie = callPackage ../development/python-modules/datrie { }; + + dbf = callPackage ../development/python-modules/dbf { }; + + dbfread = callPackage ../development/python-modules/dbfread { }; + + dbus-python = callPackage ../development/python-modules/dbus { inherit (pkgs) dbus pkgconfig; }; + + dcmstack = callPackage ../development/python-modules/dcmstack { }; + + ddt = callPackage ../development/python-modules/ddt { }; + + deap = callPackage ../development/python-modules/deap { }; + + debian = callPackage ../development/python-modules/debian { }; + + debts = callPackage ../development/python-modules/debts { }; debugpy = callPackage ../development/python-modules/debugpy { }; decorator = callPackage ../development/python-modules/decorator { }; + deepdiff = callPackage ../development/python-modules/deepdiff { }; + + deepmerge = callPackage ../development/python-modules/deepmerge { }; + + deeptoolsintervals = callPackage ../development/python-modules/deeptoolsintervals { }; + + defcon = callPackage ../development/python-modules/defcon { }; + deform = callPackage ../development/python-modules/deform { }; + defusedxml = callPackage ../development/python-modules/defusedxml { }; + + delegator-py = callPackage ../development/python-modules/delegator-py { }; + + deluge-client = callPackage ../development/python-modules/deluge-client { }; + demjson = callPackage ../development/python-modules/demjson { }; + dendropy = callPackage ../development/python-modules/dendropy { }; + + denonavr = callPackage ../development/python-modules/denonavr { }; + + dependency-injector = callPackage ../development/python-modules/dependency-injector { }; + deprecated = callPackage ../development/python-modules/deprecated { }; deprecation = callPackage ../development/python-modules/deprecation { }; derpconf = callPackage ../development/python-modules/derpconf { }; + descartes = callPackage ../development/python-modules/descartes { }; + deskcon = callPackage ../development/python-modules/deskcon { }; + detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 + + devpi-common = callPackage ../development/python-modules/devpi-common { }; + + dftfit = callPackage ../development/python-modules/dftfit { }; + + diceware = callPackage ../development/python-modules/diceware { }; + + dicom2nifti = callPackage ../development/python-modules/dicom2nifti { }; + + dict2xml = callPackage ../development/python-modules/dict2xml { }; + + dictionaries = callPackage ../development/python-modules/dictionaries { }; + + dicttoxml = callPackage ../development/python-modules/dicttoxml { }; + + diff_cover = callPackage ../development/python-modules/diff_cover { }; + + diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; + + digital-ocean = callPackage ../development/python-modules/digitalocean { }; + + digi-xbee = callPackage ../development/python-modules/digi-xbee { }; + dill = callPackage ../development/python-modules/dill { }; + diofant = callPackage ../development/python-modules/diofant { }; + + dipy = callPackage ../development/python-modules/dipy { }; + + discid = callPackage ../development/python-modules/discid { }; + discogs_client = callPackage ../development/python-modules/discogs_client { }; - dlx = callPackage ../development/python-modules/dlx { }; + discordpy = callPackage ../development/python-modules/discordpy { }; - dmenu-python = callPackage ../development/python-modules/dmenu { }; + diskcache = callPackage ../development/python-modules/diskcache { }; - dnslib = callPackage ../development/python-modules/dnslib { }; + dissononce = callPackage ../development/python-modules/dissononce { }; - dnspython = callPackage ../development/python-modules/dnspython { }; - dns = self.dnspython; # Alias for compatibility, 2017-12-10 + distlib = callPackage ../development/python-modules/distlib { }; - docker = callPackage ../development/python-modules/docker {}; + distorm3 = callPackage ../development/python-modules/distorm3 { }; - dockerfile-parse = callPackage ../development/python-modules/dockerfile-parse {}; + distributed = callPackage ../development/python-modules/distributed { }; - docker-py = disabledIf isPy27 (callPackage ../development/python-modules/docker-py {}); - - dockerpty = callPackage ../development/python-modules/dockerpty {}; - - dockerspawner = callPackage ../development/python-modules/dockerspawner {}; - - docker_pycreds = callPackage ../development/python-modules/docker-pycreds {}; - - docloud = callPackage ../development/python-modules/docloud { }; - - docplex = callPackage ../development/python-modules/docplex { }; - - docopt = callPackage ../development/python-modules/docopt { }; - - doctest-ignore-unicode = callPackage ../development/python-modules/doctest-ignore-unicode { }; - - dogpile_cache = callPackage ../development/python-modules/dogpile.cache { }; - - dogpile_core = callPackage ../development/python-modules/dogpile.core { }; - - dopy = callPackage ../development/python-modules/dopy { }; - - dpath = callPackage ../development/python-modules/dpath { }; - - dparse = callPackage ../development/python-modules/dparse { }; - - dpkt = callPackage ../development/python-modules/dpkt {}; - - urllib3 = callPackage ../development/python-modules/urllib3 {}; - - varint = callPackage ../development/python-modules/varint {}; - - drf-yasg = callPackage ../development/python-modules/drf-yasg { }; - - dropbox = callPackage ../development/python-modules/dropbox {}; - - drms = callPackage ../development/python-modules/drms { }; - - ds4drv = callPackage ../development/python-modules/ds4drv { - inherit (pkgs) fetchFromGitHub bluez; - }; - - dyn = callPackage ../development/python-modules/dyn { }; - - easydict = callPackage ../development/python-modules/easydict { }; - - easygui = callPackage ../development/python-modules/easygui { }; - - EasyProcess = callPackage ../development/python-modules/easyprocess { }; - - easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { }; - - eccodes = toPythonModule (pkgs.eccodes.override { - enablePython = true; - pythonPackages = self; - }); - - edward = callPackage ../development/python-modules/edward { }; - - elasticsearch = callPackage ../development/python-modules/elasticsearch { }; - - elasticsearch-dsl = callPackage ../development/python-modules/elasticsearch-dsl { }; - # alias - elasticsearchdsl = self.elasticsearch-dsl; - - elementpath = callPackage ../development/python-modules/elementpath { }; - - entrypoints = callPackage ../development/python-modules/entrypoints { }; - - envisage = callPackage ../development/python-modules/envisage { }; - - enzyme = callPackage ../development/python-modules/enzyme {}; - - escapism = callPackage ../development/python-modules/escapism { }; - - etcd = callPackage ../development/python-modules/etcd { }; - - evdev = callPackage ../development/python-modules/evdev {}; - - eve = callPackage ../development/python-modules/eve {}; - - eventlib = callPackage ../development/python-modules/eventlib { }; - - events = callPackage ../development/python-modules/events { }; - - eyeD3 = callPackage ../development/python-modules/eyed3 { }; - - execnet = callPackage ../development/python-modules/execnet { }; - - executor = callPackage ../development/python-modules/executor { }; - - ezdxf = callPackage ../development/python-modules/ezdxf {}; - - facebook-sdk = callPackage ../development/python-modules/facebook-sdk { }; - - face_recognition = callPackage ../development/python-modules/face_recognition { }; - - face_recognition_models = callPackage ../development/python-modules/face_recognition_models { }; - - faker = callPackage ../development/python-modules/faker { }; - - fake_factory = callPackage ../development/python-modules/fake_factory { }; - - fake-useragent = callPackage ../development/python-modules/fake-useragent { }; - - factory_boy = callPackage ../development/python-modules/factory_boy { }; - - Fabric = callPackage ../development/python-modules/Fabric { }; - - fastdtw = callPackage ../development/python-modules/fastdtw { }; - - fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; - - faulthandler = if ! isPy3k - then callPackage ../development/python-modules/faulthandler {} - else throw "faulthandler is built into ${python.executable}"; - - fb-re2 = callPackage ../development/python-modules/fb-re2 { }; - - ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { }; - - fenics = callPackage ../development/libraries/science/math/fenics { - inherit (pkgs) pkg-config; - mpi = pkgs.openmpi; - pytest = self.pytest_4; - }; - - filetype = callPackage ../development/python-modules/filetype { }; - - flammkuchen = callPackage ../development/python-modules/flammkuchen { }; - - flexmock = callPackage ../development/python-modules/flexmock { }; - - flit = callPackage ../development/python-modules/flit { }; - - flit-core = callPackage ../development/python-modules/flit-core { }; - - flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { }; - - fluent-logger = callPackage ../development/python-modules/fluent-logger {}; - - flux-led = callPackage ../development/python-modules/flux-led { }; - - python-forecastio = callPackage ../development/python-modules/python-forecastio { }; - - fpdf = callPackage ../development/python-modules/fpdf { }; - - fpylll = callPackage ../development/python-modules/fpylll { }; - - fritzconnection = callPackage ../development/python-modules/fritzconnection { }; - - frozendict = callPackage ../development/python-modules/frozendict { }; - - ftputil = callPackage ../development/python-modules/ftputil { }; - - fudge = callPackage ../development/python-modules/fudge { }; - - funcparserlib = callPackage ../development/python-modules/funcparserlib { }; - - fastcache = callPackage ../development/python-modules/fastcache { }; - - fastentrypoints = callPackage ../development/python-modules/fastentrypoints { }; - - functools32 = callPackage ../development/python-modules/functools32 { }; - - future-fstrings = callPackage ../development/python-modules/future-fstrings { }; - - fx2 = callPackage ../development/python-modules/fx2 { }; - - # gaia isn't supported with python3 and it's not available from pypi - gaia = disabledIf (isPyPy || isPy3k) (toPythonModule (pkgs.gaia.override { - pythonPackages = self; - pythonSupport = true; - })); - - gateone = callPackage ../development/python-modules/gateone { }; - - GeoIP = callPackage ../development/python-modules/GeoIP { }; - - glasgow = callPackage ../development/python-modules/glasgow { }; - - gmpy = callPackage ../development/python-modules/gmpy { }; - - gmpy2 = callPackage ../development/python-modules/gmpy2 { }; - - gmusicapi = callPackage ../development/python-modules/gmusicapi { }; - - gnureadline = callPackage ../development/python-modules/gnureadline { }; - - gnutls = callPackage ../development/python-modules/gnutls { }; - - gpy = callPackage ../development/python-modules/gpy { }; - - gpyopt = callPackage ../development/python-modules/gpyopt { }; - - gitdb = callPackage ../development/python-modules/gitdb { }; - - gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 - - GitPython = callPackage ../development/python-modules/GitPython { }; - - git-annex-adapter = callPackage ../development/python-modules/git-annex-adapter { - inherit (pkgs.gitAndTools) git-annex; - }; - - python-gitlab = callPackage ../development/python-modules/python-gitlab { }; - - google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; - - google-music = callPackage ../development/python-modules/google-music { }; - - google-music-proto = callPackage ../development/python-modules/google-music-proto { }; - - google-music-utils = callPackage ../development/python-modules/google-music-utils { }; - - google-pasta = callPackage ../development/python-modules/google-pasta { }; - - googletrans = callPackage ../development/python-modules/googletrans { }; - - gdown = callPackage ../development/python-modules/gdown { }; - - gpapi = callPackage ../development/python-modules/gpapi { }; - gplaycli = callPackage ../development/python-modules/gplaycli { }; - - gpsoauth = callPackage ../development/python-modules/gpsoauth { }; - - gpxpy = callPackage ../development/python-modules/gpxpy { }; - - grip = callPackage ../development/python-modules/grip { }; - - gst-python = callPackage ../development/python-modules/gst-python { - inherit (pkgs) meson pkgconfig; - gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; - }; - - gtimelog = callPackage ../development/python-modules/gtimelog { }; - - gtts = callPackage ../development/python-modules/gtts { }; - - gurobipy = if stdenv.hostPlatform.system == "x86_64-darwin" - then callPackage ../development/python-modules/gurobipy/darwin.nix { - inherit (pkgs.darwin) cctools insert_dylib; - } - else if stdenv.hostPlatform.system == "x86_64-linux" - then callPackage ../development/python-modules/gurobipy/linux.nix {} - else throw "gurobipy not yet supported on ${stdenv.hostPlatform.system}"; - - hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { }; - - hbmqtt = callPackage ../development/python-modules/hbmqtt { }; - - helpdev = callPackage ../development/python-modules/helpdev { }; - - heudiconv = callPackage ../development/python-modules/heudiconv { }; - - hickle = callPackage ../development/python-modules/hickle { }; - - hiro = callPackage ../development/python-modules/hiro {}; - - hglib = callPackage ../development/python-modules/hglib {}; - - huey = callPackage ../development/python-modules/huey { }; - - humanize = callPackage ../development/python-modules/humanize { }; - - humanfriendly = callPackage ../development/python-modules/humanfriendly { }; - - hupper = callPackage ../development/python-modules/hupper {}; - - hsaudiotag = callPackage ../development/python-modules/hsaudiotag { }; - - hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { }; - - hstspreload = callPackage ../development/python-modules/hstspreload { }; - - htmlmin = callPackage ../development/python-modules/htmlmin {}; - - httpauth = callPackage ../development/python-modules/httpauth { }; - - httpx = callPackage ../development/python-modules/httpx { }; - - idna-ssl = callPackage ../development/python-modules/idna-ssl { }; - - identify = callPackage ../development/python-modules/identify { }; - - ijson = callPackage ../development/python-modules/ijson {}; - - imagecodecs-lite = disabledIf (!isPy3k) (callPackage ../development/python-modules/imagecodecs-lite { }); - - imagesize = callPackage ../development/python-modules/imagesize { }; - - image-match = callPackage ../development/python-modules/image-match { }; - - imbalanced-learn = - if isPy27 then - callPackage ../development/python-modules/imbalanced-learn/0.4.nix { } - else - callPackage ../development/python-modules/imbalanced-learn { }; - - immutables = callPackage ../development/python-modules/immutables {}; - - imread = callPackage ../development/python-modules/imread { - inherit (pkgs) pkgconfig libjpeg libpng libtiff libwebp; - }; - - imaplib2 = callPackage ../development/python-modules/imaplib2 { }; - - ipfsapi = callPackage ../development/python-modules/ipfsapi { }; - - isbnlib = callPackage ../development/python-modules/isbnlib { }; - - islpy = callPackage ../development/python-modules/islpy { }; - - itsdangerous = callPackage ../development/python-modules/itsdangerous { }; - - itypes = callPackage ../development/python-modules/itypes { }; - - iniconfig = callPackage ../development/python-modules/iniconfig { }; - - iniparse = callPackage ../development/python-modules/iniparse { }; - - intreehooks = callPackage ../development/python-modules/intreehooks { }; - - i3-py = callPackage ../development/python-modules/i3-py { }; - - JayDeBeApi = callPackage ../development/python-modules/JayDeBeApi {}; - - jdcal = callPackage ../development/python-modules/jdcal { }; - - jieba = callPackage ../development/python-modules/jieba { }; - - internetarchive = callPackage ../development/python-modules/internetarchive {}; - - JPype1 = callPackage ../development/python-modules/JPype1 {}; - - jpylyzer = callPackage ../development/python-modules/jpylyzer {}; - - josepy = callPackage ../development/python-modules/josepy {}; - - jsbeautifier = callPackage ../development/python-modules/jsbeautifier {}; - - jug = callPackage ../development/python-modules/jug {}; - - jsmin = callPackage ../development/python-modules/jsmin { }; - - jsonmerge = callPackage ../development/python-modules/jsonmerge { }; - - jsonpatch = callPackage ../development/python-modules/jsonpatch { }; - - jsonpickle = callPackage ../development/python-modules/jsonpickle { }; - - jsonpointer = callPackage ../development/python-modules/jsonpointer { }; - - jsonrpclib = callPackage ../development/python-modules/jsonrpclib { }; - - jsonrpclib-pelix = callPackage ../development/python-modules/jsonrpclib-pelix {}; - - jsonwatch = callPackage ../development/python-modules/jsonwatch { }; - - kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override { - python3 = python; - }).src); - - latexcodec = callPackage ../development/python-modules/latexcodec {}; - - lazy = callPackage ../development/python-modules/lazy { }; - - libmodulemd = pipe pkgs.libmodulemd [ - toPythonModule - - (p: p.overrideAttrs (super: { - meta = super.meta // { - outputsToInstall = [ "py" ]; - # The package always builds python3 bindings - broken = (super.meta.broken or false) || !isPy3k; - }; - })) - - (p: p.override { - python3 = python; - }) - - (p: p.py) - ]; - - libselinux = pipe pkgs.libselinux [ - toPythonModule - - (p: p.overrideAttrs (super: { - meta = super.meta // { - outputsToInstall = [ "py" ]; - broken = (super.meta.broken or false) || pythonAtLeast "3.8"; - }; - })) - - (p: p.override { - enablePython = true; - inherit python; - }) - - (p: p.py) - ]; - - libsoundtouch = callPackage ../development/python-modules/libsoundtouch { }; - - libthumbor = callPackage ../development/python-modules/libthumbor { }; - - license-expression = callPackage ../development/python-modules/license-expression { }; - - lightblue = callPackage ../development/python-modules/lightblue { }; - - lightgbm = callPackage ../development/python-modules/lightgbm { }; - - lightning = callPackage ../development/python-modules/lightning { }; - - lightparam = callPackage ../development/python-modules/lightparam { }; - - jupyter = callPackage ../development/python-modules/jupyter { }; - - jupyter-c-kernel = callPackage ../development/python-modules/jupyter-c-kernel { }; - - jupyter_console = if pythonOlder "3.5" then - callPackage ../development/python-modules/jupyter_console/5.nix { } - else - callPackage ../development/python-modules/jupyter_console { }; - - jupyterlab_launcher = callPackage ../development/python-modules/jupyterlab_launcher { }; - - jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { }; - - jupyterlab = callPackage ../development/python-modules/jupyterlab {}; - - jupyterlab-git = callPackage ../development/python-modules/jupyterlab-git {}; - - jupyter-sphinx = callPackage ../development/python-modules/jupyter-sphinx { }; - - jupytext = callPackage ../development/python-modules/jupytext { }; - - PyLTI = callPackage ../development/python-modules/pylti { }; - - lmdb = callPackage ../development/python-modules/lmdb { }; - - logilab_astng = callPackage ../development/python-modules/logilab_astng { }; - - lpod = callPackage ../development/python-modules/lpod { }; - - ludios_wpull = callPackage ../development/python-modules/ludios_wpull { }; - - luftdaten = callPackage ../development/python-modules/luftdaten { }; - - m2r = callPackage ../development/python-modules/m2r { }; - - mailchimp = callPackage ../development/python-modules/mailchimp { }; - - python-mapnik = callPackage ../development/python-modules/python-mapnik { }; - - measurement = callPackage ../development/python-modules/measurement {}; - - mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override { - python3Packages = self; - })); - - midiutil = callPackage ../development/python-modules/midiutil {}; - - mido = callPackage ../development/python-modules/mido { }; - - misaka = callPackage ../development/python-modules/misaka {}; - - mlrose = callPackage ../development/python-modules/mlrose { }; - - mlflow = callPackage ../development/python-modules/mlflow { }; - - mt-940 = callPackage ../development/python-modules/mt-940 { }; - - mwlib = callPackage ../development/python-modules/mwlib { }; - - mwlib-ext = callPackage ../development/python-modules/mwlib-ext { }; - - mwlib-rl = callPackage ../development/python-modules/mwlib-rl { }; - - myfitnesspal = callPackage ../development/python-modules/myfitnesspal { }; - - natsort = callPackage ../development/python-modules/natsort { }; - - naturalsort = callPackage ../development/python-modules/naturalsort { }; - - ncclient = callPackage ../development/python-modules/ncclient {}; - - logfury = callPackage ../development/python-modules/logfury { }; - - ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { }; - - netcdf4 = callPackage ../development/python-modules/netcdf4 { }; - - netdisco = callPackage ../development/python-modules/netdisco { }; - - Nikola = callPackage ../development/python-modules/Nikola { }; - - nmigen = callPackage ../development/python-modules/nmigen { }; - - nmigen-boards = callPackage ../development/python-modules/nmigen-boards { }; - - nmigen-soc = callPackage ../development/python-modules/nmigen-soc { }; - - nxt-python = callPackage ../development/python-modules/nxt-python { }; - - odfpy = callPackage ../development/python-modules/odfpy { }; - - openrazer = callPackage ../development/python-modules/openrazer/pylib.nix { }; - openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { }; - - oset = callPackage ../development/python-modules/oset { }; - - oscrypto = callPackage ../development/python-modules/oscrypto { }; - - osqp = callPackage ../development/python-modules/osqp { }; - - oyaml = callPackage ../development/python-modules/oyaml { }; - - pam = callPackage ../development/python-modules/pam { - inherit (pkgs) pam; - }; - - pamela = callPackage ../development/python-modules/pamela { }; - - paperspace = callPackage ../development/python-modules/paperspace { }; - - paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { }; - - papis = callPackage ../development/python-modules/papis { }; - - papis-python-rofi = callPackage ../development/python-modules/papis-python-rofi { }; - - pathspec = callPackage ../development/python-modules/pathspec { }; - - pathtools = callPackage ../development/python-modules/pathtools { }; - - paver = callPackage ../development/python-modules/paver { }; - - passlib = callPackage ../development/python-modules/passlib { }; - - path-and-address = callPackage ../development/python-modules/path-and-address { }; - - peppercorn = callPackage ../development/python-modules/peppercorn { }; - - pex = callPackage ../development/python-modules/pex { }; - - phe = callPackage ../development/python-modules/phe { }; - - phpserialize = callPackage ../development/python-modules/phpserialize { }; - - plaid-python = callPackage ../development/python-modules/plaid-python { }; - - plaster = callPackage ../development/python-modules/plaster {}; - - plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy {}; - - playsound = callPackage ../development/python-modules/playsound { }; - - plexapi = callPackage ../development/python-modules/plexapi { }; - - plexauth = callPackage ../development/python-modules/plexauth { }; - - plexwebsocket = callPackage ../development/python-modules/plexwebsocket { }; - - plotly = callPackage ../development/python-modules/plotly { }; - - plyfile = callPackage ../development/python-modules/plyfile { }; - - podcastparser = callPackage ../development/python-modules/podcastparser { }; - - podcats = callPackage ../development/python-modules/podcats { }; - - pomegranate = callPackage ../development/python-modules/pomegranate { }; - - poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { - inherit (pkgs.qt5) qtbase; - inherit (pkgs.libsForQt5) poppler; - inherit (pkgs) pkgconfig; - }; - - poyo = callPackage ../development/python-modules/poyo { }; - - priority = callPackage ../development/python-modules/priority { }; - - privacyidea = callPackage ../development/python-modules/privacyidea { }; - privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { }; - - prov = callPackage ../development/python-modules/prov { }; - - pudb = callPackage ../development/python-modules/pudb { }; - - pybtex = callPackage ../development/python-modules/pybtex {}; - - pybtex-docutils = callPackage ../development/python-modules/pybtex-docutils {}; - - pycallgraph = callPackage ../development/python-modules/pycallgraph { }; - - pycassa = callPackage ../development/python-modules/pycassa { }; - - lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { - python3 = python; - })); - - pyblake2 = callPackage ../development/python-modules/pyblake2 { }; - - pybluez = callPackage ../development/python-modules/pybluez { }; - - pycares = callPackage ../development/python-modules/pycares { }; - - pycuda = callPackage ../development/python-modules/pycuda { - cudatoolkit = pkgs.cudatoolkit; - inherit (pkgs.stdenv) mkDerivation; - }; - - pydotplus = callPackage ../development/python-modules/pydotplus { }; - - pyfxa = callPackage ../development/python-modules/pyfxa { }; - - pygls = callPackage ../development/python-modules/pygls {}; - - pyhomematic = callPackage ../development/python-modules/pyhomematic { }; - - pylama = callPackage ../development/python-modules/pylama { }; - - pylatexenc = callPackage ../development/python-modules/pylatexenc { }; - - pymbolic = callPackage ../development/python-modules/pymbolic { }; - - pymediainfo = callPackage ../development/python-modules/pymediainfo { }; - - pyphen = callPackage ../development/python-modules/pyphen {}; - - pypoppler = callPackage ../development/python-modules/pypoppler { }; - - pypillowfight = callPackage ../development/python-modules/pypillowfight { }; - - pyprind = callPackage ../development/python-modules/pyprind { }; - - python-axolotl = callPackage ../development/python-modules/python-axolotl { }; - - python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { }; - - python-pam = callPackage ../development/python-modules/python-pam { }; - - pythonix = callPackage ../development/python-modules/pythonix { - inherit (pkgs) meson pkgconfig; - }; - - python-lzf = callPackage ../development/python-modules/python-lzf { }; - - pyramid = callPackage ../development/python-modules/pyramid { }; - - pyramid_beaker = callPackage ../development/python-modules/pyramid_beaker { }; - - pyramid_chameleon = callPackage ../development/python-modules/pyramid_chameleon { }; - - pyramid_jinja2 = callPackage ../development/python-modules/pyramid_jinja2 { }; - - pyramid_mako = callPackage ../development/python-modules/pyramid_mako { }; - - peewee = callPackage ../development/python-modules/peewee { }; - - pyroma = callPackage ../development/python-modules/pyroma { }; - - pyroute2 = callPackage ../development/python-modules/pyroute2 { }; - - pyspf = callPackage ../development/python-modules/pyspf { }; - - pysptk = callPackage ../development/python-modules/pysptk { }; - - pysrim = callPackage ../development/python-modules/pysrim { }; - - pysrt = callPackage ../development/python-modules/pysrt { }; - - pytools = callPackage ../development/python-modules/pytools { }; - - python-constraint = callPackage ../development/python-modules/python-constraint { }; - - python-ctags3 = callPackage ../development/python-modules/python-ctags3 { }; - - python-lzo = callPackage ../development/python-modules/python-lzo { - inherit (pkgs) lzo; - }; - - pxml = callPackage ../development/python-modules/pxml { }; - - junos-eznc = callPackage ../development/python-modules/junos-eznc {}; - - raven = callPackage ../development/python-modules/raven { }; - - rawkit = callPackage ../development/python-modules/rawkit { }; - - joblib = callPackage ../development/python-modules/joblib { }; - - sarge = callPackage ../development/python-modules/sarge { }; - - subliminal = callPackage ../development/python-modules/subliminal {}; - - sunpy = callPackage ../development/python-modules/sunpy { }; - - hyperkitty = callPackage ../servers/mail/mailman/hyperkitty.nix { }; - - robot-detection = callPackage ../development/python-modules/robot-detection {}; - - cssmin = callPackage ../development/python-modules/cssmin {}; - - django-paintstore = callPackage ../development/python-modules/django-paintstore {}; - - django-q = callPackage ../development/python-modules/django-q {}; - - hyperlink = callPackage ../development/python-modules/hyperlink {}; - - zope_copy = callPackage ../development/python-modules/zope_copy {}; - - s2clientprotocol = callPackage ../development/python-modules/s2clientprotocol { }; - - py3status = callPackage ../development/python-modules/py3status {}; - - pyrtlsdr = callPackage ../development/python-modules/pyrtlsdr { }; - - scandir = callPackage ../development/python-modules/scandir { }; - - schema = callPackage ../development/python-modules/schema {}; - - simple-websocket-server = callPackage ../development/python-modules/simple-websocket-server {}; - - stem = callPackage ../development/python-modules/stem { }; - - svg-path = callPackage ../development/python-modules/svg-path { }; - - r2pipe = callPackage ../development/python-modules/r2pipe { }; - - regex = callPackage ../development/python-modules/regex { }; - - pygrok = callPackage ../development/python-modules/pygrok { }; - - regional = callPackage ../development/python-modules/regional { }; - - ratelimiter = callPackage ../development/python-modules/ratelimiter { }; - - pywatchman = callPackage ../development/python-modules/pywatchman { }; - - pywavelets = callPackage ../development/python-modules/pywavelets { }; - - vcrpy = callPackage ../development/python-modules/vcrpy { }; - - descartes = callPackage ../development/python-modules/descartes { }; - - chardet = callPackage ../development/python-modules/chardet { }; - - pyramid_exclog = callPackage ../development/python-modules/pyramid_exclog { }; - - pyramid_multiauth = callPackage ../development/python-modules/pyramid_multiauth { }; - - pyramid_hawkauth = callPackage ../development/python-modules/pyramid_hawkauth { }; - - pytun = callPackage ../development/python-modules/pytun { }; - - rethinkdb = callPackage ../development/python-modules/rethinkdb { }; - - roku = callPackage ../development/python-modules/roku { }; - - roman = callPackage ../development/python-modules/roman { }; - - rotate-backups = callPackage ../tools/backup/rotate-backups { }; - - liblarch = callPackage ../development/python-modules/liblarch { }; - - librosa = callPackage ../development/python-modules/librosa { }; - - samplerate = callPackage ../development/python-modules/samplerate { }; - - screeninfo = callPackage ../development/python-modules/screeninfo { }; - - ssdeep = callPackage ../development/python-modules/ssdeep { }; - - ssdp = callPackage ../development/python-modules/ssdp { }; - - statsd = callPackage ../development/python-modules/statsd { }; - - starfish = callPackage ../development/python-modules/starfish { }; - - swagger-ui-bundle = callPackage ../development/python-modules/swagger-ui-bundle { }; - - multi_key_dict = callPackage ../development/python-modules/multi_key_dict { }; - - random2 = callPackage ../development/python-modules/random2 { }; - - schedule = callPackage ../development/python-modules/schedule { }; - - repoze_lru = callPackage ../development/python-modules/repoze_lru { }; - - repoze_sphinx_autointerface = callPackage ../development/python-modules/repoze_sphinx_autointerface { }; - - setuptools-git = callPackage ../development/python-modules/setuptools-git { }; - - setuptools-lint = callPackage ../development/python-modules/setuptools-lint { }; - - sievelib = callPackage ../development/python-modules/sievelib { }; - - watchdog = callPackage ../development/python-modules/watchdog { }; - - zope_deprecation = callPackage ../development/python-modules/zope_deprecation { }; - - validators = callPackage ../development/python-modules/validators { }; - - validictory = callPackage ../development/python-modules/validictory { }; - - validate-email = callPackage ../development/python-modules/validate-email { }; - - venusian = callPackage ../development/python-modules/venusian { }; - - chameleon = callPackage ../development/python-modules/chameleon { }; - - ddt = callPackage ../development/python-modules/ddt { }; + distro = callPackage ../development/python-modules/distro { }; distutils_extra = callPackage ../development/python-modules/distutils_extra { }; - pyxdg = callPackage ../development/python-modules/pyxdg { }; - - crayons = callPackage ../development/python-modules/crayons{ }; - - django = self.django_lts; - - django_lts = self.django_2_2; - django_2_2 = callPackage ../development/python-modules/django/2_2.nix { }; django-allauth = callPackage ../development/python-modules/django-allauth { }; - django-anymail = callPackage ../development/python-modules/django-anymail {}; + django-anymail = callPackage ../development/python-modules/django-anymail { }; django_appconf = callPackage ../development/python-modules/django_appconf { }; django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { }; - django_colorful = callPackage ../development/python-modules/django_colorful { }; - django-cache-url = callPackage ../development/python-modules/django-cache-url { }; + django_classytags = callPackage ../development/python-modules/django_classytags { }; + django-cleanup = callPackage ../development/python-modules/django-cleanup { }; - django-configurations = callPackage ../development/python-modules/django-configurations { }; + django_colorful = callPackage ../development/python-modules/django_colorful { }; + + django_compat = callPackage ../development/python-modules/django-compat { }; django_compressor = callPackage ../development/python-modules/django_compressor { }; - django_compat = callPackage ../development/python-modules/django-compat { }; + django-configurations = callPackage ../development/python-modules/django-configurations { }; django_contrib_comments = callPackage ../development/python-modules/django_contrib_comments { }; @@ -3802,30 +1585,71 @@ in { django_guardian = callPackage ../development/python-modules/django_guardian { }; + django-haystack = callPackage ../development/python-modules/django-haystack { }; + + django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { }; + + django_hijack = callPackage ../development/python-modules/django-hijack + { }; # This package may need an older version of Django. Override the package set and set e.g. `django = super.django_1_9`. See the Nixpkgs manual for examples on how to override the package set. + django-ipware = callPackage ../development/python-modules/django-ipware { }; django-jinja = callPackage ../development/python-modules/django-jinja2 { }; django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { }; + django_lts = self.django_2_2; + django-mailman3 = callPackage ../development/python-modules/django-mailman3 { }; + django_modelcluster = callPackage ../development/python-modules/django_modelcluster { }; + + django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { }; + + django_nose = callPackage ../development/python-modules/django_nose { }; + django-oauth-toolkit = callPackage ../development/python-modules/django-oauth-toolkit { }; + django-paintstore = callPackage ../development/python-modules/django-paintstore { }; + django-pglocks = callPackage ../development/python-modules/django-pglocks { }; django-picklefield = callPackage ../development/python-modules/django-picklefield { }; + django_pipeline = callPackage ../development/python-modules/django-pipeline { }; + django_polymorphic = callPackage ../development/python-modules/django-polymorphic { }; django-postgresql-netfields = callPackage ../development/python-modules/django-postgresql-netfields { }; + django-q = callPackage ../development/python-modules/django-q { }; + + djangoql = callPackage ../development/python-modules/djangoql { }; + django-ranged-response = callPackage ../development/python-modules/django-ranged-response { }; + django-raster = callPackage ../development/python-modules/django-raster { }; + + django_redis = callPackage ../development/python-modules/django_redis { }; + django-rest-auth = callPackage ../development/python-modules/django-rest-auth { }; + djangorestframework = callPackage ../development/python-modules/djangorestframework { }; + + djangorestframework-jwt = callPackage ../development/python-modules/djangorestframework-jwt { }; + + djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { }; + + django_reversion = callPackage ../development/python-modules/django_reversion { }; + django-sampledatahelper = callPackage ../development/python-modules/django-sampledatahelper { }; + django = self.django_lts; + + django-sesame = callPackage ../development/python-modules/django-sesame { }; + + django_silk = callPackage ../development/python-modules/django_silk { }; + django-simple-captcha = callPackage ../development/python-modules/django-simple-captcha { }; django-sites = callPackage ../development/python-modules/django-sites { }; @@ -3834,144 +1658,351 @@ in { django-storages = callPackage ../development/python-modules/django-storages { }; - django-versatileimagefield = callPackage ../development/python-modules/django-versatileimagefield { }; - - django-webpack-loader = callPackage ../development/python-modules/django-webpack-loader { }; - - django-widget-tweaks = callPackage ../development/python-modules/django-widget-tweaks { }; - django_tagging = callPackage ../development/python-modules/django_tagging { }; - django_classytags = callPackage ../development/python-modules/django_classytags { }; - - # This package may need an older version of Django. - # Override the package set and set e.g. `django = super.django_1_9`. - # See the Nixpkgs manual for examples on how to override the package set. - django_hijack = callPackage ../development/python-modules/django-hijack { }; - - django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { }; - - django_nose = callPackage ../development/python-modules/django_nose { }; - - django_modelcluster = callPackage ../development/python-modules/django_modelcluster { }; - - djangorestframework = callPackage ../development/python-modules/djangorestframework { }; - - djangorestframework-jwt = callPackage ../development/python-modules/djangorestframework-jwt { }; - - djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { }; - - django-raster = callPackage ../development/python-modules/django-raster { }; - - django_redis = callPackage ../development/python-modules/django_redis { }; - - django_reversion = callPackage ../development/python-modules/django_reversion { }; - - django_silk = callPackage ../development/python-modules/django_silk { }; - django_taggit = callPackage ../development/python-modules/django_taggit { }; django_treebeard = callPackage ../development/python-modules/django_treebeard { }; - django_pipeline = callPackage ../development/python-modules/django-pipeline { }; + django-versatileimagefield = callPackage ../development/python-modules/django-versatileimagefield { }; - djangoql = callPackage ../development/python-modules/djangoql { }; + django-webpack-loader = callPackage ../development/python-modules/django-webpack-loader { }; + + django-widget-tweaks = callPackage ../development/python-modules/django-widget-tweaks { }; dj-database-url = callPackage ../development/python-modules/dj-database-url { }; dj-email-url = callPackage ../development/python-modules/dj-email-url { }; - dj-search-url = callPackage ../development/python-modules/dj-search-url { }; - djmail = callPackage ../development/python-modules/djmail { }; - pillowfight = callPackage ../development/python-modules/pillowfight { }; + dj-search-url = callPackage ../development/python-modules/dj-search-url { }; - kaptan = callPackage ../development/python-modules/kaptan { }; + dkimpy = callPackage ../development/python-modules/dkimpy { }; - keepalive = callPackage ../development/python-modules/keepalive { }; + dlib = callPackage ../development/python-modules/dlib { inherit (pkgs) dlib; }; - keyrings-alt = callPackage ../development/python-modules/keyrings-alt {}; + dlx = callPackage ../development/python-modules/dlx { }; - SPARQLWrapper = callPackage ../development/python-modules/sparqlwrapper { }; + dmenu-python = callPackage ../development/python-modules/dmenu { }; - duckdb = callPackage ../development/python-modules/duckdb { - duckdb = pkgs.duckdb; - }; + dm-sonnet = callPackage ../development/python-modules/dm-sonnet { }; + + dnslib = callPackage ../development/python-modules/dnslib { }; + + dnspython = callPackage ../development/python-modules/dnspython { }; + dns = self.dnspython; # Alias for compatibility, 2017-12-10 + + doc8 = callPackage ../development/python-modules/doc8 { }; + + docker = callPackage ../development/python-modules/docker { }; + + dockerfile-parse = callPackage ../development/python-modules/dockerfile-parse { }; + + dockerpty = callPackage ../development/python-modules/dockerpty { }; + + docker_pycreds = callPackage ../development/python-modules/docker-pycreds { }; + + docker-py = disabledIf isPy27 (callPackage ../development/python-modules/docker-py { }); + + dockerspawner = callPackage ../development/python-modules/dockerspawner { }; + + docloud = callPackage ../development/python-modules/docloud { }; + + docopt = callPackage ../development/python-modules/docopt { }; + + docplex = callPackage ../development/python-modules/docplex { }; + + docrep = callPackage ../development/python-modules/docrep { }; + + doctest-ignore-unicode = callPackage ../development/python-modules/doctest-ignore-unicode { }; + + docutils = callPackage ../development/python-modules/docutils { }; + + dodgy = callPackage ../development/python-modules/dodgy { }; + + dogpile_cache = callPackage ../development/python-modules/dogpile.cache { }; + + dogpile_core = callPackage ../development/python-modules/dogpile.core { }; + + dogtail = callPackage ../development/python-modules/dogtail { }; + + dominate = callPackage ../development/python-modules/dominate { }; + + dopy = callPackage ../development/python-modules/dopy { }; + + dot2tex = callPackage ../development/python-modules/dot2tex { inherit (pkgs) graphviz; }; + + dotnetcore2 = callPackage ../development/python-modules/dotnetcore2 { inherit (pkgs) substituteAll dotnet-sdk; }; + + dparse = callPackage ../development/python-modules/dparse { }; + + dpath = callPackage ../development/python-modules/dpath { }; + + dpkt = callPackage ../development/python-modules/dpkt { }; + + drf-yasg = callPackage ../development/python-modules/drf-yasg { }; + + drms = callPackage ../development/python-modules/drms { }; + + dropbox = callPackage ../development/python-modules/dropbox { }; + + ds4drv = callPackage ../development/python-modules/ds4drv { inherit (pkgs) fetchFromGitHub bluez; }; + + dtopt = callPackage ../development/python-modules/dtopt { }; + + duckdb = callPackage ../development/python-modules/duckdb { duckdb = pkgs.duckdb; }; + + duecredit = callPackage ../development/python-modules/duecredit { }; + + dugong = callPackage ../development/python-modules/dugong { }; dulwich = if isPy3k then callPackage ../development/python-modules/dulwich { } else callPackage ../development/python-modules/dulwich/0_19.nix { }; - hg-git = callPackage ../development/python-modules/hg-git { }; + dyn = callPackage ../development/python-modules/dyn { }; - hg-evolve = callPackage ../development/python-modules/hg-evolve { }; + dynd = callPackage ../development/python-modules/dynd { }; - dtopt = callPackage ../development/python-modules/dtopt { }; + easydict = callPackage ../development/python-modules/easydict { }; + + easygui = callPackage ../development/python-modules/easygui { }; + + EasyProcess = callPackage ../development/python-modules/easyprocess { }; + + easysnmp = callPackage ../development/python-modules/easysnmp { + openssl = pkgs.openssl; + net-snmp = pkgs.net-snmp; + }; + + easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { }; easywatch = callPackage ../development/python-modules/easywatch { }; + eccodes = toPythonModule (pkgs.eccodes.override { + enablePython = true; + pythonPackages = self; + }); + ecdsa = callPackage ../development/python-modules/ecdsa { }; ecos = callPackage ../development/python-modules/ecos { }; - effect = callPackage ../development/python-modules/effect {}; + ecpy = callPackage ../development/python-modules/ecpy { }; + + ed25519 = callPackage ../development/python-modules/ed25519 { }; + + editorconfig = callPackage ../development/python-modules/editorconfig { }; + + edward = callPackage ../development/python-modules/edward { }; + + effect = callPackage ../development/python-modules/effect { }; + + eggdeps = callPackage ../development/python-modules/eggdeps { }; + + elasticsearch = callPackage ../development/python-modules/elasticsearch { }; + + elasticsearch-dsl = callPackage ../development/python-modules/elasticsearch-dsl { }; + + elasticsearchdsl = self.elasticsearch-dsl; # alias + + elementpath = callPackage ../development/python-modules/elementpath { }; + + eliot = callPackage ../development/python-modules/eliot { }; + + emailthreads = callPackage ../development/python-modules/emailthreads { }; + + email_validator = callPackage ../development/python-modules/email-validator { }; + + emcee = callPackage ../development/python-modules/emcee { }; + + emoji = callPackage ../development/python-modules/emoji { }; + + enaml = callPackage ../development/python-modules/enaml { }; + + enamlx = callPackage ../development/python-modules/enamlx { }; + + entrance = callPackage ../development/python-modules/entrance { routerFeatures = false; }; + + entrance-with-router-features = callPackage ../development/python-modules/entrance { routerFeatures = true; }; + + entrypoints = callPackage ../development/python-modules/entrypoints { }; + + enum34 = callPackage ../development/python-modules/enum34 { }; enum = callPackage ../development/python-modules/enum { }; enum-compat = callPackage ../development/python-modules/enum-compat { }; - enum34 = callPackage ../development/python-modules/enum34 { }; + envisage = callPackage ../development/python-modules/envisage { }; + + envs = callPackage ../development/python-modules/envs { }; + + enzyme = callPackage ../development/python-modules/enzyme { }; epc = callPackage ../development/python-modules/epc { }; - et_xmlfile = callPackage ../development/python-modules/et_xmlfile { }; + ephem = callPackage ../development/python-modules/ephem { }; + + eradicate = callPackage ../development/python-modules/eradicate { }; + + escapism = callPackage ../development/python-modules/escapism { }; + + etcd = callPackage ../development/python-modules/etcd { }; + + etelemetry = callPackage ../development/python-modules/etelemetry { }; etesync = callPackage ../development/python-modules/etesync { }; + eth-hash = callPackage ../development/python-modules/eth-hash { }; + + eth-typing = callPackage ../development/python-modules/eth-typing { }; + + eth-utils = callPackage ../development/python-modules/eth-utils { }; + + et_xmlfile = callPackage ../development/python-modules/et_xmlfile { }; + + evdev = callPackage ../development/python-modules/evdev { }; + + eve = callPackage ../development/python-modules/eve { }; + eventlet = callPackage ../development/python-modules/eventlet { }; + eventlib = callPackage ../development/python-modules/eventlib { }; + + events = callPackage ../development/python-modules/events { }; + + evernote = callPackage ../development/python-modules/evernote { }; + + ewmh = callPackage ../development/python-modules/ewmh { }; + + exchangelib = callPackage ../development/python-modules/exchangelib { }; + + execnet = callPackage ../development/python-modules/execnet { }; + executing = callPackage ../development/python-modules/executing { }; + executor = callPackage ../development/python-modules/executor { }; + exifread = callPackage ../development/python-modules/exifread { }; + extension-helpers = callPackage ../development/python-modules/extension-helpers { }; + + extras = callPackage ../development/python-modules/extras { }; + + eyeD3 = callPackage ../development/python-modules/eyed3 { }; + + ezdxf = callPackage ../development/python-modules/ezdxf { }; + + Fabric = callPackage ../development/python-modules/Fabric { }; + + facebook-sdk = callPackage ../development/python-modules/facebook-sdk { }; + + face = callPackage ../development/python-modules/face { }; + + facedancer = callPackage ../development/python-modules/facedancer { }; + + face_recognition = callPackage ../development/python-modules/face_recognition { }; + + face_recognition_models = callPackage ../development/python-modules/face_recognition_models { }; + + factory_boy = callPackage ../development/python-modules/factory_boy { }; + + fake_factory = callPackage ../development/python-modules/fake_factory { }; + + faker = callPackage ../development/python-modules/faker { }; + + fake-useragent = callPackage ../development/python-modules/fake-useragent { }; + + falcon = callPackage ../development/python-modules/falcon { }; + + fastapi = callPackage ../development/python-modules/fastapi { }; + + fastcache = callPackage ../development/python-modules/fastcache { }; + + fastdtw = callPackage ../development/python-modules/fastdtw { }; + + fasteners = callPackage ../development/python-modules/fasteners { }; + + fastentrypoints = callPackage ../development/python-modules/fastentrypoints { }; + fastimport = callPackage ../development/python-modules/fastimport { }; + fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; + fastpair = callPackage ../development/python-modules/fastpair { }; - fastrlock = callPackage ../development/python-modules/fastrlock {}; + fastparquet = callPackage ../development/python-modules/fastparquet { }; + + fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { }; + + fastrlock = callPackage ../development/python-modules/fastrlock { }; + + fasttext = callPackage ../development/python-modules/fasttext { }; + + faulthandler = if !isPy3k then + callPackage ../development/python-modules/faulthandler { } + else + throw "faulthandler is built into ${python.executable}"; + + favicon = callPackage ../development/python-modules/favicon { }; + + fb-re2 = callPackage ../development/python-modules/fb-re2 { }; + + fdint = callPackage ../development/python-modules/fdint { }; feedgen = callPackage ../development/python-modules/feedgen { }; - feedgenerator = callPackage ../development/python-modules/feedgenerator { - inherit (pkgs) glibcLocales; - }; + feedgenerator = callPackage ../development/python-modules/feedgenerator { inherit (pkgs) glibcLocales; }; feedparser = callPackage ../development/python-modules/feedparser { }; - pyfribidi = callPackage ../development/python-modules/pyfribidi { }; + fenics = callPackage ../development/libraries/science/math/fenics { + inherit (pkgs) pkg-config; + mpi = pkgs.openmpi; + pytest = self.pytest_4; + }; - pyfritzhome = callPackage ../development/python-modules/pyfritzhome { }; + ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { }; - pyftpdlib = callPackage ../development/python-modules/pyftpdlib { }; + fido2 = callPackage ../development/python-modules/fido2 { }; filebrowser_safe = callPackage ../development/python-modules/filebrowser_safe { }; - pycodestyle = callPackage ../development/python-modules/pycodestyle { }; - filebytes = callPackage ../development/python-modules/filebytes { }; - filelock = callPackage ../development/python-modules/filelock {}; + filelock = callPackage ../development/python-modules/filelock { }; + + filemagic = callPackage ../development/python-modules/filemagic { }; + + filetype = callPackage ../development/python-modules/filetype { }; + + filterpy = callPackage ../development/python-modules/filterpy { }; + + finalfusion = callPackage ../development/python-modules/finalfusion { }; + + fints = callPackage ../development/python-modules/fints { }; fiona = callPackage ../development/python-modules/fiona { gdal_2 = pkgs.gdal_2; }; + fipy = callPackage ../development/python-modules/fipy { }; + + fire = callPackage ../development/python-modules/fire { }; + + firetv = callPackage ../development/python-modules/firetv { }; + + first = callPackage ../development/python-modules/first { }; + fitbit = callPackage ../development/python-modules/fitbit { }; - flake8 = callPackage ../development/python-modules/flake8 { }; + fixtures = callPackage ../development/python-modules/fixtures { }; flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { }; + flake8 = callPackage ../development/python-modules/flake8 { }; + flake8-debugger = callPackage ../development/python-modules/flake8-debugger { }; flake8-future-import = callPackage ../development/python-modules/flake8-future-import { }; @@ -3982,20 +2013,22 @@ in { flaky = callPackage ../development/python-modules/flaky { }; - flask = callPackage ../development/python-modules/flask { }; + flammkuchen = callPackage ../development/python-modules/flammkuchen { }; flask-admin = callPackage ../development/python-modules/flask-admin { }; - flask-appbuilder = callPackage ../development/python-modules/flask-appbuilder { }; - flask-api = callPackage ../development/python-modules/flask-api { }; + flask-appbuilder = callPackage ../development/python-modules/flask-appbuilder { }; + flask_assets = callPackage ../development/python-modules/flask-assets { }; flask-autoindex = callPackage ../development/python-modules/flask-autoindex { }; flask-babel = callPackage ../development/python-modules/flask-babel { }; + flaskbabel = callPackage ../development/python-modules/flaskbabel { }; + flask-babelex = callPackage ../development/python-modules/flask-babelex { }; flask-bcrypt = callPackage ../development/python-modules/flask-bcrypt { }; @@ -4004,6 +2037,8 @@ in { flask-caching = callPackage ../development/python-modules/flask-caching { }; + flask = callPackage ../development/python-modules/flask { }; + flask-common = callPackage ../development/python-modules/flask-common { }; flask-compress = callPackage ../development/python-modules/flask-compress { }; @@ -4016,12 +2051,12 @@ in { flask-jwt-extended = callPackage ../development/python-modules/flask-jwt-extended { }; + flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { }; + flask-limiter = callPackage ../development/python-modules/flask-limiter { }; flask_login = callPackage ../development/python-modules/flask-login { }; - flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { }; - flask_mail = callPackage ../development/python-modules/flask-mail { }; flask_marshmallow = callPackage ../development/python-modules/flask-marshmallow { }; @@ -4066,65 +2101,30 @@ in { flask_wtf = callPackage ../development/python-modules/flask-wtf { }; - wtforms = callPackage ../development/python-modules/wtforms { }; + flexmock = callPackage ../development/python-modules/flexmock { }; - wtf-peewee = callPackage ../development/python-modules/wtf-peewee { }; + flickrapi = callPackage ../development/python-modules/flickrapi { }; - graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { - inherit (pkgs) pkg-config; - }; + flit = callPackage ../development/python-modules/flit { }; - grappelli_safe = callPackage ../development/python-modules/grappelli_safe { }; + flit-core = callPackage ../development/python-modules/flit-core { }; - greatfet = callPackage ../development/python-modules/greatfet { }; + flower = callPackage ../development/python-modules/flower { }; - pygreat = callPackage ../development/python-modules/pygreat { }; + flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { }; - pytorch = callPackage ../development/python-modules/pytorch { - cudaSupport = pkgs.config.cudaSupport or false; - }; + fluent-logger = callPackage ../development/python-modules/fluent-logger { }; - pyro-ppl = callPackage ../development/python-modules/pyro-ppl {}; + flufl_bounce = callPackage ../development/python-modules/flufl/bounce.nix { }; - opt-einsum = if isPy27 then - callPackage ../development/python-modules/opt-einsum/2.nix {} - else - callPackage ../development/python-modules/opt-einsum {}; + flufl_i18n = callPackage ../development/python-modules/flufl/i18n.nix { }; - pytorchWithCuda = self.pytorch.override { - cudaSupport = true; - }; - - pytorchWithoutCuda = self.pytorch.override { - cudaSupport = false; - }; - - pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { }; - - pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { }; - - pythondialog = callPackage ../development/python-modules/pythondialog { }; - - python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { }; - - pyRFC3339 = callPackage ../development/python-modules/pyrfc3339 { }; - - rfc3987 = callPackage ../development/python-modules/rfc3987 { }; - - ConfigArgParse = callPackage ../development/python-modules/configargparse { }; - - jsonschema = callPackage ../development/python-modules/jsonschema { }; - - vcver = callPackage ../development/python-modules/vcver { }; - - vcversioner = callPackage ../development/python-modules/vcversioner { }; - - falcon = callPackage ../development/python-modules/falcon { }; - - hug = callPackage ../development/python-modules/hug { }; + flufl_lock = callPackage ../development/python-modules/flufl/lock.nix { }; flup = callPackage ../development/python-modules/flup { }; + flux-led = callPackage ../development/python-modules/flux-led { }; + fn = callPackage ../development/python-modules/fn { }; folium = callPackage ../development/python-modules/folium { }; @@ -4134,28 +2134,101 @@ in { inherit python; })); + fontmath = callPackage ../development/python-modules/fontmath { }; + + fontparts = callPackage ../development/python-modules/fontparts { }; + + fontpens = callPackage ../development/python-modules/fontpens { }; + fonttools = callPackage ../development/python-modules/fonttools { }; foolscap = callPackage ../development/python-modules/foolscap { }; forbiddenfruit = callPackage ../development/python-modules/forbiddenfruit { }; + FormEncode = callPackage ../development/python-modules/FormEncode { }; + + foundationdb51 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb51; }; + foundationdb52 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb52; }; + foundationdb60 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb60; }; + foundationdb61 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb61; }; + + foxdot = callPackage ../development/python-modules/foxdot { }; + + fpdf = callPackage ../development/python-modules/fpdf { }; + + fpylll = callPackage ../development/python-modules/fpylll { }; + + freetype-py = callPackage ../development/python-modules/freetype-py { }; + + freezegun = callPackage ../development/python-modules/freezegun { }; + + fritzconnection = callPackage ../development/python-modules/fritzconnection { }; + + frozendict = callPackage ../development/python-modules/frozendict { }; + + fs = callPackage ../development/python-modules/fs { }; + + fs-s3fs = callPackage ../development/python-modules/fs-s3fs { }; + + fsspec = callPackage ../development/python-modules/fsspec { }; + + ftfy = callPackage ../development/python-modules/ftfy { }; + + ftputil = callPackage ../development/python-modules/ftputil { }; + + fudge = callPackage ../development/python-modules/fudge { }; + + funcparserlib = callPackage ../development/python-modules/funcparserlib { }; + + funcsigs = callPackage ../development/python-modules/funcsigs { }; + + functools32 = callPackage ../development/python-modules/functools32 { }; + + funcy = callPackage ../development/python-modules/funcy { }; + + furl = callPackage ../development/python-modules/furl { }; + + fuse = callPackage ../development/python-modules/fuse-python { inherit (pkgs) fuse pkgconfig; }; + fusepy = callPackage ../development/python-modules/fusepy { }; future = callPackage ../development/python-modules/future { }; + future-fstrings = callPackage ../development/python-modules/future-fstrings { }; + futures = callPackage ../development/python-modules/futures { }; + fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { }; + + fx2 = callPackage ../development/python-modules/fx2 { }; + + gaia = disabledIf (isPyPy || isPy3k) (toPythonModule (pkgs.gaia.override { + pythonPackages = self; + pythonSupport = true; + })); # gaia isn't supported with python3 and it's not available from pypi + galario = toPythonModule (pkgs.galario.override { enablePython = true; pythonPackages = self; }); + gast = callPackage ../development/python-modules/gast { }; + + gateone = callPackage ../development/python-modules/gateone { }; + gcovr = callPackage ../development/python-modules/gcovr { }; - gdal = toPythonModule (pkgs.gdal.override { - pythonPackages = self; - }); + gdal = toPythonModule (pkgs.gdal.override { pythonPackages = self; }); + + gdata = callPackage ../development/python-modules/gdata { }; + + gdcm = disabledIf isPy27 (toPythonModule (pkgs.gdcm.override { + inherit (self) python; + enablePython = true; + })); + + gdown = callPackage ../development/python-modules/gdown { }; gdrivefs = callPackage ../development/python-modules/gdrivefs { }; @@ -4164,72 +2237,131 @@ in { python3 = python; })); + geeknote = callPackage ../development/python-modules/geeknote { }; + + genanki = callPackage ../development/python-modules/genanki { }; + + genpy = callPackage ../development/python-modules/genpy { }; + genshi = callPackage ../development/python-modules/genshi { }; + gensim = callPackage ../development/python-modules/gensim { }; + gentools = callPackage ../development/python-modules/gentools { }; + genzshcomp = callPackage ../development/python-modules/genzshcomp { }; + + geoalchemy2 = callPackage ../development/python-modules/geoalchemy2 { }; + + geographiclib = callPackage ../development/python-modules/geographiclib { }; + + geoip2 = callPackage ../development/python-modules/geoip2 { }; + + GeoIP = callPackage ../development/python-modules/GeoIP { }; + + geojson = callPackage ../development/python-modules/geojson { }; + + geopandas = callPackage ../development/python-modules/geopandas { }; + + geopy = if isPy3k then + callPackage ../development/python-modules/geopy { } + else + callPackage ../development/python-modules/geopy/2.nix { }; + + getmac = callPackage ../development/python-modules/getmac { }; + gevent = callPackage ../development/python-modules/gevent { }; geventhttpclient = callPackage ../development/python-modules/geventhttpclient { }; gevent-socketio = callPackage ../development/python-modules/gevent-socketio { }; - geopandas = callPackage ../development/python-modules/geopandas { }; - - geojson = callPackage ../development/python-modules/geojson { }; - gevent-websocket = callPackage ../development/python-modules/gevent-websocket { }; - genzshcomp = callPackage ../development/python-modules/genzshcomp { }; - gflags = callPackage ../development/python-modules/gflags { }; ghdiff = callPackage ../development/python-modules/ghdiff { }; + gidgethub = callPackage ../development/python-modules/gidgethub { }; + + gin-config = callPackage ../development/python-modules/gin-config { }; + gipc = callPackage ../development/python-modules/gipc { }; + git-annex-adapter = + callPackage ../development/python-modules/git-annex-adapter { inherit (pkgs.gitAndTools) git-annex; }; + + gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 + + gitdb = callPackage ../development/python-modules/gitdb { }; + + github3_py = callPackage ../development/python-modules/github3_py { }; + + github-webhook = callPackage ../development/python-modules/github-webhook { }; + + GitPython = callPackage ../development/python-modules/GitPython { }; + git-revise = callPackage ../development/python-modules/git-revise { }; git-sweep = callPackage ../development/python-modules/git-sweep { }; glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 - github3_py = callPackage ../development/python-modules/github3_py { }; + glasgow = callPackage ../development/python-modules/glasgow { }; - github-webhook = callPackage ../development/python-modules/github-webhook { }; + glob2 = callPackage ../development/python-modules/glob2 { }; + + globre = callPackage ../development/python-modules/globre { }; + + globus-sdk = callPackage ../development/python-modules/globus-sdk { }; + + glom = callPackage ../development/python-modules/glom { }; + + glymur = callPackage ../development/python-modules/glymur { }; + + gmpy2 = callPackage ../development/python-modules/gmpy2 { }; + + gmpy = callPackage ../development/python-modules/gmpy { }; + + gmusicapi = callPackage ../development/python-modules/gmusicapi { }; + + gnureadline = callPackage ../development/python-modules/gnureadline { }; + + gnutls = callPackage ../development/python-modules/gnutls { }; goobook = callPackage ../development/python-modules/goobook { }; - googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { }; - - google-auth-httplib2 = callPackage ../development/python-modules/google-auth-httplib2 { }; - - google-auth-oauthlib = callPackage ../development/python-modules/google-auth-oauthlib { }; + goocalendar = callPackage ../development/python-modules/goocalendar { }; google_api_core = callPackage ../development/python-modules/google_api_core { }; - google_api_python_client = let - google_api_python_client = callPackage ../development/python-modules/google-api-python-client { }; - in if isPy3k then google_api_python_client else - # Python 2.7 support was deprecated but is still needed by weboob and duplicity - google_api_python_client.overridePythonAttrs (old: rec { - version = "1.7.6"; - src = old.src.override { - inherit version; - sha256 = "14w5sdrp0bk9n0r2lmpqmrbf2zclpfq6q7giyahnskkfzdkb165z"; - }; - }); + google_api_python_client = + let google_api_python_client = callPackage ../development/python-modules/google-api-python-client { }; + in if isPy3k then + google_api_python_client + else # Python 2.7 support was deprecated but is still needed by weboob and duplicity + google_api_python_client.overridePythonAttrs (old: rec { + version = "1.7.6"; + src = old.src.override { + inherit version; + sha256 = "14w5sdrp0bk9n0r2lmpqmrbf2zclpfq6q7giyahnskkfzdkb165z"; + }; + }); + + googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { }; google_apputils = callPackage ../development/python-modules/google_apputils { }; google_auth = callPackage ../development/python-modules/google_auth { }; + google-auth-httplib2 = callPackage ../development/python-modules/google-auth-httplib2 { }; + + google-auth-oauthlib = callPackage ../development/python-modules/google-auth-oauthlib { }; + google_cloud_asset = callPackage ../development/python-modules/google_cloud_asset { }; google_cloud_automl = callPackage ../development/python-modules/google_cloud_automl { }; - google_cloud_core = callPackage ../development/python-modules/google_cloud_core { }; - google_cloud_bigquery = callPackage ../development/python-modules/google_cloud_bigquery { }; google_cloud_bigquery_datatransfer = callPackage ../development/python-modules/google_cloud_bigquery_datatransfer { }; @@ -4238,6 +2370,8 @@ in { google_cloud_container = callPackage ../development/python-modules/google_cloud_container { }; + google_cloud_core = callPackage ../development/python-modules/google_cloud_core { }; + google_cloud_dataproc = callPackage ../development/python-modules/google_cloud_dataproc { }; google_cloud_datastore = callPackage ../development/python-modules/google_cloud_datastore { }; @@ -4274,10 +2408,10 @@ in { google_cloud_spanner = callPackage ../development/python-modules/google_cloud_spanner { }; - google_cloud_storage = callPackage ../development/python-modules/google_cloud_storage { }; - google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { }; + google_cloud_storage = callPackage ../development/python-modules/google_cloud_storage { }; + google_cloud_tasks = callPackage ../development/python-modules/google_cloud_tasks { }; google_cloud_testutils = callPackage ../development/python-modules/google_cloud_testutils { }; @@ -4294,182 +2428,426 @@ in { google_cloud_websecurityscanner = callPackage ../development/python-modules/google_cloud_websecurityscanner { }; + google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; + google-i18n-address = callPackage ../development/python-modules/google-i18n-address { }; + google-music = callPackage ../development/python-modules/google-music { }; + + google-music-proto = callPackage ../development/python-modules/google-music-proto { }; + + google-music-utils = callPackage ../development/python-modules/google-music-utils { }; + + google-pasta = callPackage ../development/python-modules/google-pasta { }; + google_resumable_media = callPackage ../development/python-modules/google_resumable_media { }; + googletrans = callPackage ../development/python-modules/googletrans { }; + gorilla = callPackage ../development/python-modules/gorilla { }; + gpapi = callPackage ../development/python-modules/gpapi { }; + gplaycli = callPackage ../development/python-modules/gplaycli { }; + gpgme = toPythonModule (pkgs.gpgme.override { pythonSupport = true; inherit python; }); - gphoto2 = callPackage ../development/python-modules/gphoto2 { - inherit (pkgs) pkgconfig; - }; + gphoto2 = callPackage ../development/python-modules/gphoto2 { inherit (pkgs) pkgconfig; }; + + gprof2dot = callPackage ../development/python-modules/gprof2dot { inherit (pkgs) graphviz; }; + + gpsoauth = callPackage ../development/python-modules/gpsoauth { }; + + gpxpy = callPackage ../development/python-modules/gpxpy { }; + + gpy = callPackage ../development/python-modules/gpy { }; + + gpyopt = callPackage ../development/python-modules/gpyopt { }; + + grammalecte = callPackage ../development/python-modules/grammalecte { }; + + grandalf = callPackage ../development/python-modules/grandalf { }; + + graphite_api = callPackage ../development/python-modules/graphite-api { }; + + graphite_beacon = callPackage ../development/python-modules/graphite_beacon { }; + + graphite-web = callPackage ../development/python-modules/graphite-web { }; + + graph_nets = callPackage ../development/python-modules/graph_nets { }; graphql-core = callPackage ../development/python-modules/graphql-core { }; graphql-server-core = callPackage ../development/python-modules/graphql-server-core { }; - grammalecte = callPackage ../development/python-modules/grammalecte { }; + graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { inherit (pkgs) pkg-config; }; + + graphviz = callPackage ../development/python-modules/graphviz { inherit (pkgs) graphviz; }; + + grappelli_safe = callPackage ../development/python-modules/grappelli_safe { }; + + graspy = callPackage ../development/python-modules/graspy { }; + + greatfet = callPackage ../development/python-modules/greatfet { }; + + green = callPackage ../development/python-modules/green { }; greenlet = callPackage ../development/python-modules/greenlet { }; - grib-api = disabledIf (!isPy27) (toPythonModule - (pkgs.grib-api.override { - enablePython = true; - pythonPackages = self; - })); + grequests = callPackage ../development/python-modules/grequests { }; - grpcio = callPackage ../development/python-modules/grpcio { }; + grib-api = disabledIf (!isPy27) (toPythonModule (pkgs.grib-api.override { + enablePython = true; + pythonPackages = self; + })); - grpcio-tools = callPackage ../development/python-modules/grpcio-tools { }; - - grpcio-gcp = callPackage ../development/python-modules/grpcio-gcp { }; + grip = callPackage ../development/python-modules/grip { }; grpc_google_iam_v1 = callPackage ../development/python-modules/grpc_google_iam_v1 { }; + grpcio = callPackage ../development/python-modules/grpcio { }; + + grpcio-gcp = callPackage ../development/python-modules/grpcio-gcp { }; + + grpcio-tools = callPackage ../development/python-modules/grpcio-tools { }; + + gsd = if isPy27 then + callPackage ../development/python-modules/gsd/1.7.nix { } + else + callPackage ../development/python-modules/gsd { }; + gspread = callPackage ../development/python-modules/gspread { }; + gssapi = callPackage ../development/python-modules/gssapi { inherit (pkgs) darwin krb5Full; }; + + gst-python = callPackage ../development/python-modules/gst-python { + inherit (pkgs) meson pkgconfig; + gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; + }; + + gtimelog = callPackage ../development/python-modules/gtimelog { }; + + gtts = callPackage ../development/python-modules/gtts { }; + gtts-token = callPackage ../development/python-modules/gtts-token { }; + guessit = callPackage ../development/python-modules/guessit { }; + + guestfs = callPackage ../development/python-modules/guestfs { }; + + gumath = callPackage ../development/python-modules/gumath { }; + + gunicorn = if isPy27 then + callPackage ../development/python-modules/gunicorn/19.nix { } + else + callPackage ../development/python-modules/gunicorn { }; + + gurobipy = if stdenv.hostPlatform.system == "x86_64-darwin" then + callPackage ../development/python-modules/gurobipy/darwin.nix { inherit (pkgs.darwin) cctools insert_dylib; } + else if stdenv.hostPlatform.system == "x86_64-linux" then + callPackage ../development/python-modules/gurobipy/linux.nix { } + else + throw "gurobipy not yet supported on ${stdenv.hostPlatform.system}"; + + guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { }; + + gwyddion = disabledIf isPy3k (toPythonModule (pkgs.gwyddion.override { + pythonSupport = true; + pythonPackages = self; + })); + gym = callPackage ../development/python-modules/gym { }; gyp = callPackage ../development/python-modules/gyp { }; - guessit = callPackage ../development/python-modules/guessit { }; + h11 = callPackage ../development/python-modules/h11 { }; - rebulk = callPackage ../development/python-modules/rebulk { }; + h2 = callPackage ../development/python-modules/h2 { }; - gunicorn = if isPy27 then - callPackage ../development/python-modules/gunicorn/19.nix { } - else - callPackage ../development/python-modules/gunicorn { }; + h3 = callPackage ../development/python-modules/h3 { inherit (pkgs) h3; }; + + h5netcdf = callPackage ../development/python-modules/h5netcdf { }; + + h5py = callPackage ../development/python-modules/h5py { hdf5 = pkgs.hdf5; }; + + h5py-mpi = self.h5py.override { hdf5 = pkgs.hdf5-mpi; }; + + habanero = callPackage ../development/python-modules/habanero { }; + + ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; + + handout = callPackage ../development/python-modules/handout { }; + + HAP-python = callPackage ../development/python-modules/HAP-python { }; + + hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { }; hawkauthlib = callPackage ../development/python-modules/hawkauthlib { }; - hdbscan = callPackage ../development/python-modules/hdbscan { }; + hbmqtt = callPackage ../development/python-modules/hbmqtt { }; - hmmlearn = callPackage ../development/python-modules/hmmlearn { }; + hcloud = callPackage ../development/python-modules/hcloud { }; hcs_utils = callPackage ../development/python-modules/hcs_utils { }; + hdbscan = callPackage ../development/python-modules/hdbscan { }; + + hdlparse = callPackage ../development/python-modules/hdlparse { }; + + hdmedians = callPackage ../development/python-modules/hdmedians { }; + + heapdict = callPackage ../development/python-modules/heapdict { }; + + helpdev = callPackage ../development/python-modules/helpdev { }; + + helper = callPackage ../development/python-modules/helper { }; + + hepmc3 = toPythonModule (pkgs.hepmc3.override { inherit python; }); + hetzner = callPackage ../development/python-modules/hetzner { }; + heudiconv = callPackage ../development/python-modules/heudiconv { }; + + hg-evolve = callPackage ../development/python-modules/hg-evolve { }; + + hg-git = callPackage ../development/python-modules/hg-git { }; + + hglib = callPackage ../development/python-modules/hglib { }; + + hgsvn = callPackage ../development/python-modules/hgsvn { }; + + hickle = callPackage ../development/python-modules/hickle { }; + + hidapi = callPackage ../development/python-modules/hidapi { inherit (pkgs) udev libusb1; }; + + hieroglyph = callPackage ../development/python-modules/hieroglyph { }; + hiredis = callPackage ../development/python-modules/hiredis { }; + hiro = callPackage ../development/python-modules/hiro { }; + + hiyapyco = callPackage ../development/python-modules/hiyapyco { }; + + hkdf = callPackage ../development/python-modules/hkdf { }; + + hmmlearn = callPackage ../development/python-modules/hmmlearn { }; + + hocr-tools = callPackage ../development/python-modules/hocr-tools { }; + + holidays = callPackage ../development/python-modules/holidays { }; + + holoviews = callPackage ../development/python-modules/holoviews { }; + homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { }; - htmllaundry = callPackage ../development/python-modules/htmllaundry { }; + hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { inherit python; }); - html-sanitizer = callPackage ../development/python-modules/html-sanitizer { }; + hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { }; + + howdoi = callPackage ../development/python-modules/howdoi { }; + + hpack = callPackage ../development/python-modules/hpack { }; + + hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { }; + + hsaudiotag = callPackage ../development/python-modules/hsaudiotag { }; + + hstspreload = callPackage ../development/python-modules/hstspreload { }; + + html2text = if isPy3k then + callPackage ../development/python-modules/html2text { } + else + callPackage ../development/python-modules/html2text/2018.nix { }; html5lib = callPackage ../development/python-modules/html5lib { }; + html5-parser = callPackage ../development/python-modules/html5-parser { inherit (pkgs) pkgconfig; }; + + htmllaundry = callPackage ../development/python-modules/htmllaundry { }; + + htmlmin = callPackage ../development/python-modules/htmlmin { }; + + html-sanitizer = callPackage ../development/python-modules/html-sanitizer { }; + + htmltreediff = callPackage ../development/python-modules/htmltreediff { }; + + HTSeq = callPackage ../development/python-modules/HTSeq { }; + httmock = callPackage ../development/python-modules/httmock { }; - http_signature = callPackage ../development/python-modules/http_signature { }; + httpauth = callPackage ../development/python-modules/httpauth { }; httpbin = callPackage ../development/python-modules/httpbin { }; + http-ece = callPackage ../development/python-modules/http-ece { }; + httplib2 = callPackage ../development/python-modules/httplib2 { }; - hvac = callPackage ../development/python-modules/hvac { }; - - hydra = callPackage ../development/python-modules/hydra { }; - - # File name is called 2.nix because this one will need to remain for Python 2. - hypothesis_4 = callPackage ../development/python-modules/hypothesis/2.nix { }; - - hypothesis = if isPy3k then - callPackage ../development/python-modules/hypothesis { } - else - self.hypothesis_4; - - hypothesis-auto = callPackage ../development/python-modules/hypothesis-auto { }; - - hydra-check = callPackage ../development/python-modules/hydra-check { }; - - colored = callPackage ../development/python-modules/colored { }; - - xdg = callPackage ../development/python-modules/xdg { }; - - xdis = callPackage ../development/python-modules/xdis { }; - - xnd = callPackage ../development/python-modules/xnd { }; - - uncompyle6 = callPackage ../development/python-modules/uncompyle6 { }; - - unrpa = callPackage ../development/python-modules/unrpa { }; - - lsi = callPackage ../development/python-modules/lsi { }; - - hkdf = callPackage ../development/python-modules/hkdf { }; - httpretty = if isPy3k then callPackage ../development/python-modules/httpretty { } else callPackage ../development/python-modules/httpretty/0.nix { }; + httpserver = callPackage ../development/python-modules/httpserver { }; + + httpsig = callPackage ../development/python-modules/httpsig { }; + + http_signature = callPackage ../development/python-modules/http_signature { }; + + httptools = callPackage ../development/python-modules/httptools { }; + + httpx = callPackage ../development/python-modules/httpx { }; + + huey = callPackage ../development/python-modules/huey { }; + + hug = callPackage ../development/python-modules/hug { }; + + humanfriendly = callPackage ../development/python-modules/humanfriendly { }; + + humanize = callPackage ../development/python-modules/humanize { }; + + hupper = callPackage ../development/python-modules/hupper { }; + + hvac = callPackage ../development/python-modules/hvac { }; + + hvplot = callPackage ../development/python-modules/hvplot { }; + + hwi = callPackage ../development/python-modules/hwi { }; + + hydra = callPackage ../development/python-modules/hydra { }; + + hydra-check = callPackage ../development/python-modules/hydra-check { }; + + hypchat = callPackage ../development/python-modules/hypchat { }; + + hyperframe = callPackage ../development/python-modules/hyperframe { }; + + hyperkitty = callPackage ../servers/mail/mailman/hyperkitty.nix { }; + + hyperlink = callPackage ../development/python-modules/hyperlink { }; + + hypothesis_4 = callPackage ../development/python-modules/hypothesis/2.nix + { }; # File name is called 2.nix because this one will need to remain for Python 2. + + hypothesis-auto = callPackage ../development/python-modules/hypothesis-auto { }; + + hypothesis = if isPy3k then callPackage ../development/python-modules/hypothesis { } else self.hypothesis_4; + + i3ipc = callPackage ../development/python-modules/i3ipc { }; + + i3-py = callPackage ../development/python-modules/i3-py { }; + iapws = callPackage ../development/python-modules/iapws { }; + ibis = callPackage ../development/python-modules/ibis { }; + + ibis-framework = callPackage ../development/python-modules/ibis-framework { }; + icalendar = callPackage ../development/python-modules/icalendar { }; icecream = callPackage ../development/python-modules/icecream { }; ics = callPackage ../development/python-modules/ics { }; + identify = callPackage ../development/python-modules/identify { }; + + idna = callPackage ../development/python-modules/idna { }; + + idna-ssl = callPackage ../development/python-modules/idna-ssl { }; + ifaddr = callPackage ../development/python-modules/ifaddr { }; ifconfig-parser = callPackage ../development/python-modules/ifconfig-parser { }; + ignite = callPackage ../development/python-modules/ignite { }; + + ihatemoney = callPackage ../development/python-modules/ihatemoney { }; + + ijson = callPackage ../development/python-modules/ijson { }; + + imagecodecs-lite = disabledIf (!isPy3k) (callPackage ../development/python-modules/imagecodecs-lite { }); + imagecorruptions = callPackage ../development/python-modules/imagecorruptions { }; imageio = callPackage ../development/python-modules/imageio { }; imageio-ffmpeg = callPackage ../development/python-modules/imageio-ffmpeg { }; + image-match = callPackage ../development/python-modules/image-match { }; + + imagesize = callPackage ../development/python-modules/imagesize { }; + + IMAPClient = callPackage ../development/python-modules/imapclient { }; + + imaplib2 = callPackage ../development/python-modules/imaplib2 { }; + + imbalanced-learn = if isPy27 then + callPackage ../development/python-modules/imbalanced-learn/0.4.nix { } + else + callPackage ../development/python-modules/imbalanced-learn { }; + + img2pdf = callPackage ../development/python-modules/img2pdf { }; + imgaug = callPackage ../development/python-modules/imgaug { }; + immutables = callPackage ../development/python-modules/immutables { }; + + impacket = callPackage ../development/python-modules/impacket { }; + + importlib-metadata = callPackage ../development/python-modules/importlib-metadata { }; + + importlib-resources = callPackage ../development/python-modules/importlib-resources { }; + + importmagic = callPackage ../development/python-modules/importmagic { }; + + imread = + callPackage ../development/python-modules/imread { inherit (pkgs) pkgconfig libjpeg libpng libtiff libwebp; }; + + imutils = callPackage ../development/python-modules/imutils { }; + + incremental = callPackage ../development/python-modules/incremental { }; + + inflect = callPackage ../development/python-modules/inflect { }; + inflection = callPackage ../development/python-modules/inflection { }; influxdb = callPackage ../development/python-modules/influxdb { }; + influxdb-client = callPackage ../development/python-modules/influxdb-client { }; + + influxgraph = callPackage ../development/python-modules/influxgraph { }; + infoqscraper = callPackage ../development/python-modules/infoqscraper { }; + iniconfig = callPackage ../development/python-modules/iniconfig { }; + inifile = callPackage ../development/python-modules/inifile { }; - interruptingcow = callPackage ../development/python-modules/interruptingcow {}; + iniparse = callPackage ../development/python-modules/iniparse { }; + + inotify-simple = callPackage ../development/python-modules/inotify-simple { }; + + inquirer = callPackage ../development/python-modules/inquirer { }; + + intake = callPackage ../development/python-modules/intake { }; + + intelhex = callPackage ../development/python-modules/intelhex { }; + + internetarchive = callPackage ../development/python-modules/internetarchive { }; + + interruptingcow = callPackage ../development/python-modules/interruptingcow { }; + + intervaltree = callPackage ../development/python-modules/intervaltree { }; + + intreehooks = callPackage ../development/python-modules/intreehooks { }; + + invoke = callPackage ../development/python-modules/invoke { }; iocapture = callPackage ../development/python-modules/iocapture { }; - iptools = callPackage ../development/python-modules/iptools { }; - - ipy = callPackage ../development/python-modules/IPy { }; - - ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { }; - - ipykernel = if pythonOlder "3.4" then - callPackage ../development/python-modules/ipykernel/4.nix { } - else - callPackage ../development/python-modules/ipykernel { }; - - ipyparallel = callPackage ../development/python-modules/ipyparallel { }; - - ipython = if isPy27 then - callPackage ../development/python-modules/ipython/5.nix { } - else - callPackage ../development/python-modules/ipython { }; - - ipython_genutils = callPackage ../development/python-modules/ipython_genutils { }; - - ipyvue = callPackage ../development/python-modules/ipyvue { }; - - ipyvuetify = callPackage ../development/python-modules/ipyvuetify { }; - - ipywidgets = callPackage ../development/python-modules/ipywidgets { }; + iowait = callPackage ../development/python-modules/iowait { }; ipaddr = callPackage ../development/python-modules/ipaddr { }; @@ -4479,156 +2857,389 @@ in { ipdbplugin = callPackage ../development/python-modules/ipdbplugin { }; - pythonIRClib = callPackage ../development/python-modules/pythonirclib { }; + ipfsapi = callPackage ../development/python-modules/ipfsapi { }; - iso-639 = callPackage ../development/python-modules/iso-639 {}; + iptools = callPackage ../development/python-modules/iptools { }; - iso3166 = callPackage ../development/python-modules/iso3166 {}; + ipy = callPackage ../development/python-modules/IPy { }; + + ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { }; + + ipykernel = if pythonOlder "3.4" then + callPackage ../development/python-modules/ipykernel/4.nix { } + else + callPackage ../development/python-modules/ipykernel { }; + + ipympl = callPackage ../development/python-modules/ipympl { }; + + ipyparallel = callPackage ../development/python-modules/ipyparallel { }; + + ipython_genutils = callPackage ../development/python-modules/ipython_genutils { }; + + ipython = if isPy27 then + callPackage ../development/python-modules/ipython/5.nix { } + else + callPackage ../development/python-modules/ipython { }; + + ipyvue = callPackage ../development/python-modules/ipyvue { }; + + ipyvuetify = callPackage ../development/python-modules/ipyvuetify { }; + + ipywidgets = callPackage ../development/python-modules/ipywidgets { }; + + irc = callPackage ../development/python-modules/irc { }; + + isbnlib = callPackage ../development/python-modules/isbnlib { }; + + islpy = callPackage ../development/python-modules/islpy { }; + + iso3166 = callPackage ../development/python-modules/iso3166 { }; + + iso-639 = callPackage ../development/python-modules/iso-639 { }; iso8601 = callPackage ../development/python-modules/iso8601 { }; - isort = callPackage ../development/python-modules/isort {}; + isodate = callPackage ../development/python-modules/isodate { }; - isoweek = callPackage ../development/python-modules/isoweek {}; + isort = callPackage ../development/python-modules/isort { }; - jabberbot = callPackage ../development/python-modules/jabberbot {}; + isoweek = callPackage ../development/python-modules/isoweek { }; - jedi = callPackage ../development/python-modules/jedi { }; + itanium_demangler = callPackage ../development/python-modules/itanium_demangler { }; - jellyfish = callPackage ../development/python-modules/jellyfish { }; + itemadapter = callPackage ../development/python-modules/itemadapter { }; - jeepney = callPackage ../development/python-modules/jeepney { }; + itemloaders = callPackage ../development/python-modules/itemloaders { }; + + iterm2 = callPackage ../development/python-modules/iterm2 { }; + + itsdangerous = callPackage ../development/python-modules/itsdangerous { }; + + itypes = callPackage ../development/python-modules/itypes { }; j2cli = callPackage ../development/python-modules/j2cli { }; - jinja2 = callPackage ../development/python-modules/jinja2 { }; + jabberbot = callPackage ../development/python-modules/jabberbot { }; - jinja2_time = callPackage ../development/python-modules/jinja2_time { }; + janus = callPackage ../development/python-modules/janus { }; + + jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; + + jaraco_collections = callPackage ../development/python-modules/jaraco_collections { }; + + jaraco_functools = if pythonOlder "3.6" then + callPackage ../development/python-modules/jaraco_functools/2.nix { } + else + callPackage ../development/python-modules/jaraco_functools { }; + + jaraco_itertools = callPackage ../development/python-modules/jaraco_itertools { }; + + jaraco_logging = callPackage ../development/python-modules/jaraco_logging { }; + + jaraco_stream = if pythonOlder "3.6" then + callPackage ../development/python-modules/jaraco_stream/2.nix { } + else + callPackage ../development/python-modules/jaraco_stream { }; + + jaraco_text = callPackage ../development/python-modules/jaraco_text { }; + + javaobj-py3 = callPackage ../development/python-modules/javaobj-py3 { }; + + javaproperties = callPackage ../development/python-modules/javaproperties { }; + + JayDeBeApi = callPackage ../development/python-modules/JayDeBeApi { }; + + jc = callPackage ../development/python-modules/jc { }; + + jdatetime = callPackage ../development/python-modules/jdatetime { }; + + jdcal = callPackage ../development/python-modules/jdcal { }; + + jedi = callPackage ../development/python-modules/jedi { }; + + jeepney = callPackage ../development/python-modules/jeepney { }; + + jellyfin-apiclient-python = callPackage ../development/python-modules/jellyfin-apiclient-python { }; + + jellyfish = callPackage ../development/python-modules/jellyfish { }; + + jenkinsapi = callPackage ../development/python-modules/jenkinsapi { }; + + jenkins-job-builder = callPackage ../development/python-modules/jenkins-job-builder { }; + + jieba = callPackage ../development/python-modules/jieba { }; + + jinja2 = callPackage ../development/python-modules/jinja2 { }; jinja2_pluralize = callPackage ../development/python-modules/jinja2_pluralize { }; + jinja2_time = callPackage ../development/python-modules/jinja2_time { }; + + jira = callPackage ../development/python-modules/jira { }; + jmespath = callPackage ../development/python-modules/jmespath { }; - journalwatch = callPackage ../tools/system/journalwatch { - inherit (self) systemd pytest; - }; + joblib = callPackage ../development/python-modules/joblib { }; - jq = callPackage ../development/python-modules/jq { - inherit (pkgs) jq; - }; + josepy = callPackage ../development/python-modules/josepy { }; + + journalwatch = callPackage ../tools/system/journalwatch { inherit (self) systemd pytest; }; + + jpylyzer = callPackage ../development/python-modules/jpylyzer { }; + + JPype1 = callPackage ../development/python-modules/JPype1 { }; + + jq = callPackage ../development/python-modules/jq { inherit (pkgs) jq; }; + + jsbeautifier = callPackage ../development/python-modules/jsbeautifier { }; + + jsmin = callPackage ../development/python-modules/jsmin { }; jsondate = callPackage ../development/python-modules/jsondate { }; jsondiff = callPackage ../development/python-modules/jsondiff { }; - jsonnet = buildPythonPackage { - inherit (pkgs.jsonnet) name src; - }; + jsonlines = callPackage ../development/python-modules/jsonlines { }; + + jsonmerge = callPackage ../development/python-modules/jsonmerge { }; + + json-merge-patch = callPackage ../development/python-modules/json-merge-patch { }; + + jsonnet = buildPythonPackage { inherit (pkgs.jsonnet) name src; }; + + jsonpatch = callPackage ../development/python-modules/jsonpatch { }; + + jsonpath = callPackage ../development/python-modules/jsonpath { }; + + jsonpath_rw = callPackage ../development/python-modules/jsonpath_rw { }; + + jsonpickle = callPackage ../development/python-modules/jsonpickle { }; + + jsonpointer = callPackage ../development/python-modules/jsonpointer { }; + + jsonref = callPackage ../development/python-modules/jsonref { }; + + jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { }; + + jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { }; + + jsonrpclib = callPackage ../development/python-modules/jsonrpclib { }; + + jsonrpclib-pelix = callPackage ../development/python-modules/jsonrpclib-pelix { }; + + jsonrpc-websocket = callPackage ../development/python-modules/jsonrpc-websocket { }; + + jsonschema = callPackage ../development/python-modules/jsonschema { }; + + jsonwatch = callPackage ../development/python-modules/jsonwatch { }; + + jug = callPackage ../development/python-modules/jug { }; + + junitparser = callPackage ../development/python-modules/junitparser { }; + + junit-xml = callPackage ../development/python-modules/junit-xml { }; + + junos-eznc = callPackage ../development/python-modules/junos-eznc { }; + + jupyter = callPackage ../development/python-modules/jupyter { }; + + jupyter-c-kernel = callPackage ../development/python-modules/jupyter-c-kernel { }; jupyter_client = if isPy3k then callPackage ../development/python-modules/jupyter_client { } else callPackage ../development/python-modules/jupyter_client/5.nix { }; + jupyter_console = if pythonOlder "3.5" then + callPackage ../development/python-modules/jupyter_console/5.nix { } + else + callPackage ../development/python-modules/jupyter_console { }; + jupyter_core = callPackage ../development/python-modules/jupyter_core { }; - jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { - pkgs-docker = pkgs.docker; - }; - - jupyter-telemetry = callPackage ../development/python-modules/jupyter-telemetry { }; - jupyterhub = callPackage ../development/python-modules/jupyterhub { }; jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { }; + jupyterhub-systemdspawner = + callPackage ../development/python-modules/jupyterhub-systemdspawner { inherit (pkgs) bash; }; + jupyterhub-tmpauthenticator = callPackage ../development/python-modules/jupyterhub-tmpauthenticator { }; - jupyterhub-systemdspawner = callPackage ../development/python-modules/jupyterhub-systemdspawner { - inherit (pkgs) bash; - }; + jupyterlab = callPackage ../development/python-modules/jupyterlab { }; + + jupyterlab-git = callPackage ../development/python-modules/jupyterlab-git { }; + + jupyterlab_launcher = callPackage ../development/python-modules/jupyterlab_launcher { }; + + jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { }; + + jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { pkgs-docker = pkgs.docker; }; + + jupyter-sphinx = callPackage ../development/python-modules/jupyter-sphinx { }; + + jupyter-telemetry = callPackage ../development/python-modules/jupyter-telemetry { }; + + jupytext = callPackage ../development/python-modules/jupytext { }; + + jwcrypto = callPackage ../development/python-modules/jwcrypto { }; + + k5test = callPackage ../development/python-modules/k5test { inherit (pkgs) krb5Full findutils which; }; + + kaa-base = callPackage ../development/python-modules/kaa-base { }; + + kaa-metadata = callPackage ../development/python-modules/kaa-metadata { }; + + kafka-python = callPackage ../development/python-modules/kafka-python { }; kaggle = callPackage ../development/python-modules/kaggle { }; + kaitaistruct = callPackage ../development/python-modules/kaitaistruct { }; + + Kajiki = callPackage ../development/python-modules/kajiki { }; + + kaptan = callPackage ../development/python-modules/kaptan { }; + + kazoo = callPackage ../development/python-modules/kazoo { }; + + kconfiglib = callPackage ../development/python-modules/kconfiglib { }; + + keepalive = callPackage ../development/python-modules/keepalive { }; + + keepkey_agent = callPackage ../development/python-modules/keepkey_agent { }; + + keepkey = callPackage ../development/python-modules/keepkey { }; + + keras-applications = callPackage ../development/python-modules/keras-applications { }; + + Keras = callPackage ../development/python-modules/keras { }; + + keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { }; + + kerberos = callPackage ../development/python-modules/kerberos { inherit (pkgs) kerberos; }; + keyring = if isPy3k then callPackage ../development/python-modules/keyring { } else callPackage ../development/python-modules/keyring/2.nix { }; + keyrings-alt = callPackage ../development/python-modules/keyrings-alt { }; + keyutils = callPackage ../development/python-modules/keyutils { inherit (pkgs) keyutils; }; + kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override { python3 = python; }).src); + + kinparse = callPackage ../development/python-modules/kinparse { }; + + kitchen = callPackage ../development/python-modules/kitchen { }; + kiwisolver = if isPy3k then callPackage ../development/python-modules/kiwisolver { } else callPackage ../development/python-modules/kiwisolver/1_1.nix { }; - klaus = callPackage ../development/python-modules/klaus {}; + klaus = callPackage ../development/python-modules/klaus { }; klein = callPackage ../development/python-modules/klein { }; + kmapper = callPackage ../development/python-modules/kmapper { }; + + kmsxx = toPythonModule ((callPackage ../development/libraries/kmsxx { + inherit (pkgs.kmsxx) stdenv; + inherit (pkgs) pkgconfig; + withPython = true; + }).overrideAttrs (oldAttrs: { name = "${python.libPrefix}-${pkgs.kmsxx.name}"; })); + + knack = callPackage ../development/python-modules/knack { }; + koji = callPackage ../development/python-modules/koji { }; kombu = callPackage ../development/python-modules/kombu { }; konfig = callPackage ../development/python-modules/konfig { }; - kitchen = callPackage ../development/python-modules/kitchen { }; - - knack = callPackage ../development/python-modules/knack { }; - kubernetes = callPackage ../development/python-modules/kubernetes { }; - k5test = callPackage ../development/python-modules/k5test { - inherit (pkgs) krb5Full findutils which; - }; + labelbox = callPackage ../development/python-modules/labelbox { }; - pylast = callPackage ../development/python-modules/pylast { }; + lammps-cython = callPackage ../development/python-modules/lammps-cython { mpi = pkgs.openmpi; }; - pylru = callPackage ../development/python-modules/pylru { }; + langcodes = callPackage ../development/python-modules/langcodes { }; - libnl-python = disabledIf isPy3k - (toPythonModule (pkgs.libnl.override{pythonSupport=true; inherit python; })).py; + langdetect = callPackage ../development/python-modules/langdetect { }; + + larch = callPackage ../development/python-modules/larch { }; lark-parser = callPackage ../development/python-modules/lark-parser { }; - jsonpath_rw = callPackage ../development/python-modules/jsonpath_rw { }; + Lasagne = callPackage ../development/python-modules/lasagne { }; - kerberos = callPackage ../development/python-modules/kerberos { - inherit (pkgs) kerberos; - }; + latexcodec = callPackage ../development/python-modules/latexcodec { }; + + launchpadlib = callPackage ../development/python-modules/launchpadlib { }; + + lazr_config = callPackage ../development/python-modules/lazr/config.nix { }; + + lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { }; + + lazr-restfulclient = callPackage ../development/python-modules/lazr-restfulclient { }; + + lazr-uri = callPackage ../development/python-modules/lazr-uri { }; + + lazy = callPackage ../development/python-modules/lazy { }; lazy_import = callPackage ../development/python-modules/lazy_import { }; lazy-object-proxy = callPackage ../development/python-modules/lazy-object-proxy { }; + ldap3 = callPackage ../development/python-modules/ldap3 { }; + + ldap = callPackage ../development/python-modules/ldap { inherit (pkgs) openldap cyrus_sasl; }; + + ldappool = callPackage ../development/python-modules/ldappool { }; + ldaptor = callPackage ../development/python-modules/ldaptor { }; + leather = callPackage ../development/python-modules/leather { }; + le = callPackage ../development/python-modules/le { }; + ledger_agent = callPackage ../development/python-modules/ledger_agent { }; + + ledgerblue = callPackage ../development/python-modules/ledgerblue { }; + lektor = callPackage ../development/python-modules/lektor { }; leveldb = callPackage ../development/python-modules/leveldb { }; - python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; + libagent = callPackage ../development/python-modules/libagent { }; - python_openzwave = callPackage ../development/python-modules/python_openzwave { - inherit (pkgs) pkgconfig; - }; + libais = callPackage ../development/python-modules/libais { }; - python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { }; + libarchive-c = callPackage ../development/python-modules/libarchive-c { inherit (pkgs) libarchive; }; - python-unshare = callPackage ../development/python-modules/python-unshare { }; - - fs = callPackage ../development/python-modules/fs { }; - - fs-s3fs = callPackage ../development/python-modules/fs-s3fs { }; + libarchive = self.python-libarchive; # The latter is the name upstream uses libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; }; + libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns pkgconfig; }; + libcloud = if isPy27 then - callPackage ../development/python-modules/libcloud/2.nix { } - else - callPackage ../development/python-modules/libcloud { }; + callPackage ../development/python-modules/libcloud/2.nix { } + else + callPackage ../development/python-modules/libcloud { }; + + libevdev = callPackage ../development/python-modules/libevdev { }; + + libfdt = toPythonModule (pkgs.dtc.override { + inherit python; + pythonSupport = true; + }); + + libgpiod = disabledIf (!isPy3k) (toPythonModule (pkgs.libgpiod.override { + enablePython = true; + python3 = python; + })); libgpuarray = callPackage ../development/python-modules/libgpuarray { clblas = pkgs.clblas.override { boost = self.boost; }; @@ -4636,13 +3247,39 @@ in { inherit (pkgs.linuxPackages) nvidia_x11; }; - libgpiod = disabledIf (!isPy3k) (toPythonModule (pkgs.libgpiod.override { - enablePython = true; - python3 = python; - })); + libiio = (toPythonModule (pkgs.libiio.override { inherit python; })).python; libkeepass = callPackage ../development/python-modules/libkeepass { }; + liblarch = callPackage ../development/python-modules/liblarch { }; + + libmodulemd = pipe pkgs.libmodulemd [ + toPythonModule + (p: + p.overrideAttrs (super: { + meta = super.meta // { + outputsToInstall = [ "py" ]; # The package always builds python3 bindings + broken = (super.meta.broken or false) || !isPy3k; + }; + })) + (p: p.override { python3 = python; }) + (p: p.py) + ]; + + libmr = callPackage ../development/python-modules/libmr { }; + + libnacl = callPackage ../development/python-modules/libnacl { inherit (pkgs) libsodium; }; + + libnl-python = disabledIf isPy3k (toPythonModule (pkgs.libnl.override { + pythonSupport = true; + inherit python; + })).py; + + libplist = disabledIf isPy3k (toPythonModule (pkgs.libplist.override { + enablePython = true; + inherit python; + })).py; + libredwg = toPythonModule (pkgs.libredwg.override { enablePython = true; inherit (self) python libxml2; @@ -4650,109 +3287,238 @@ in { librepo = pipe pkgs.librepo [ toPythonModule - - (p: p.overrideAttrs (super: { - meta = super.meta // { - outputsToInstall = [ "py" ]; - }; - })) - - (p: p.override { - inherit python; - }) - + (p: p.overrideAttrs (super: { meta = super.meta // { outputsToInstall = [ "py" ]; }; })) + (p: p.override { inherit python; }) (p: p.py) ]; - libnacl = callPackage ../development/python-modules/libnacl { - inherit (pkgs) libsodium; - }; + librosa = callPackage ../development/python-modules/librosa { }; libsavitar = callPackage ../development/python-modules/libsavitar { }; - libplist = disabledIf isPy3k - (toPythonModule (pkgs.libplist.override { enablePython = true; inherit python; })).py; + libselinux = pipe pkgs.libselinux [ + toPythonModule + (p: + p.overrideAttrs (super: { + meta = super.meta // { + outputsToInstall = [ "py" ]; + broken = (super.meta.broken or false) || pythonAtLeast "3.8"; + }; + })) + (p: + p.override { + enablePython = true; + inherit python; + }) + (p: p.py) + ]; - libxml2 = (toPythonModule (pkgs.libxml2.override{pythonSupport=true; inherit python;})).py; + libsoundtouch = callPackage ../development/python-modules/libsoundtouch { }; - libxslt = (toPythonModule (pkgs.libxslt.override{pythonSupport=true; inherit python; inherit (self) libxml2;})).py; + libthumbor = callPackage ../development/python-modules/libthumbor { }; + + libtmux = callPackage ../development/python-modules/libtmux { }; + + libtorrentRasterbar = (toPythonModule (pkgs.libtorrentRasterbar.override { inherit python; })).python; + + libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; }; + + libversion = callPackage ../development/python-modules/libversion { inherit (pkgs) libversion pkgconfig; }; + + libvirt = if isPy3k then + (callPackage ../development/python-modules/libvirt { inherit (pkgs) libvirt pkgconfig; }) + else + (callPackage ../development/python-modules/libvirt/5.9.0.nix { + inherit (pkgs) pkgconfig; + libvirt = pkgs.libvirt_5_9_0; + }); + + libxml2 = (toPythonModule (pkgs.libxml2.override { + pythonSupport = true; + inherit python; + })).py; + + libxslt = (toPythonModule (pkgs.libxslt.override { + pythonSupport = true; + inherit python; + inherit (self) libxml2; + })).py; + + license-expression = callPackage ../development/python-modules/license-expression { }; + + lightblue = callPackage ../development/python-modules/lightblue { }; + + lightgbm = callPackage ../development/python-modules/lightgbm { }; + + lightning = callPackage ../development/python-modules/lightning { }; + + lightparam = callPackage ../development/python-modules/lightparam { }; + + limitlessled = callPackage ../development/python-modules/limitlessled { }; limits = callPackage ../development/python-modules/limits { }; limnoria = callPackage ../development/python-modules/limnoria { }; - line_profiler = callPackage ../development/python-modules/line_profiler { }; + linecache2 = callPackage ../development/python-modules/linecache2 { }; - linode = callPackage ../development/python-modules/linode { }; + line_profiler = callPackage ../development/python-modules/line_profiler { }; linode-api = callPackage ../development/python-modules/linode-api { }; + linode = callPackage ../development/python-modules/linode { }; + + linuxfd = callPackage ../development/python-modules/linuxfd { }; + + lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { python3 = python; })); + + livelossplot = callPackage ../development/python-modules/livelossplot { }; + livereload = callPackage ../development/python-modules/livereload { }; - llfuse = callPackage ../development/python-modules/llfuse { - inherit (pkgs) fuse pkgconfig; # use "real" fuse and pkgconfig, not the python modules - }; + livestreamer = callPackage ../development/python-modules/livestreamer { }; - locustio = callPackage ../development/python-modules/locustio { }; + livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { }; + + llfuse = callPackage ../development/python-modules/llfuse { + inherit (pkgs) fuse pkgconfig; + }; # use "real" fuse and pkgconfig, not the python modules llvmlite = callPackage ../development/python-modules/llvmlite { - llvm = pkgs.llvm_9; # llvmlite always requires a specific version of llvm. - }; + llvm = pkgs.llvm_9; + }; # llvmlite always requires a specific version of llvm. + + lmdb = callPackage ../development/python-modules/lmdb { }; + + lml = callPackage ../development/python-modules/lml { }; + + lmtpd = callPackage ../development/python-modules/lmtpd { }; + + localzone = callPackage ../development/python-modules/localzone { }; + + locket = callPackage ../development/python-modules/locket { }; lockfile = callPackage ../development/python-modules/lockfile { }; - logilab_common = callPackage ../development/python-modules/logilab/common.nix {}; + locustio = callPackage ../development/python-modules/locustio { }; - logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix {}; + Logbook = callPackage ../development/python-modules/Logbook { }; - lxml = callPackage ../development/python-modules/lxml {inherit (pkgs) libxml2 libxslt zlib;}; + logfury = callPackage ../development/python-modules/logfury { }; + + logilab_astng = callPackage ../development/python-modules/logilab_astng { }; + + logilab_common = callPackage ../development/python-modules/logilab/common.nix { }; + + logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix { }; + + logster = callPackage ../development/python-modules/logster { }; + + loguru = callPackage ../development/python-modules/loguru { }; + + logutils = callPackage ../development/python-modules/logutils { }; + + logzero = callPackage ../development/python-modules/logzero { }; + + loo-py = callPackage ../development/python-modules/loo-py { }; + + lpod = callPackage ../development/python-modules/lpod { }; + + lsi = callPackage ../development/python-modules/lsi { }; + + ludios_wpull = callPackage ../development/python-modules/ludios_wpull { }; + + luftdaten = callPackage ../development/python-modules/luftdaten { }; lxc = callPackage ../development/python-modules/lxc { }; - py_scrypt = callPackage ../development/python-modules/py_scrypt { }; + lxml = callPackage ../development/python-modules/lxml { inherit (pkgs) libxml2 libxslt zlib; }; - python_magic = callPackage ../development/python-modules/python-magic { }; + lz4 = self.python-lz4; # alias 2018-12-05 - m3u8 = callPackage ../development/python-modules/m3u8 { }; - - magic = callPackage ../development/python-modules/magic { }; + lzstring = callPackage ../development/python-modules/lzstring { }; m2crypto = callPackage ../development/python-modules/m2crypto { }; - Mako = callPackage ../development/python-modules/Mako { }; + m2r = callPackage ../development/python-modules/m2r { }; + + m3u8 = callPackage ../development/python-modules/m3u8 { }; + + mac_alias = callPackage ../development/python-modules/mac_alias { }; macfsevents = callPackage ../development/python-modules/macfsevents { inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices; }; + macropy = callPackage ../development/python-modules/macropy { }; + maestral = callPackage ../development/python-modules/maestral { }; - manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix {}; - marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix {}; - mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix {}; - mozdevice = callPackage ../development/python-modules/marionette-harness/mozdevice.nix {}; - mozfile = callPackage ../development/python-modules/marionette-harness/mozfile.nix {}; - mozhttpd = callPackage ../development/python-modules/marionette-harness/mozhttpd.nix {}; - mozinfo = callPackage ../development/python-modules/marionette-harness/mozinfo.nix {}; - mozlog = callPackage ../development/python-modules/marionette-harness/mozlog.nix {}; - moznetwork = callPackage ../development/python-modules/marionette-harness/moznetwork.nix {}; - mozprocess = callPackage ../development/python-modules/marionette-harness/mozprocess.nix {}; - mozprofile = callPackage ../development/python-modules/marionette-harness/mozprofile.nix {}; - mozrunner = callPackage ../development/python-modules/marionette-harness/mozrunner.nix {}; - moztest = callPackage ../development/python-modules/marionette-harness/moztest.nix {}; - mozversion = callPackage ../development/python-modules/marionette-harness/mozversion.nix {}; - marionette-harness = callPackage ../development/python-modules/marionette-harness {}; + magic = callPackage ../development/python-modules/magic { }; - marisa = callPackage ../development/python-modules/marisa { - marisa = pkgs.marisa; - }; + magic-wormhole = callPackage ../development/python-modules/magic-wormhole { }; + + magic-wormhole-mailbox-server = callPackage ../development/python-modules/magic-wormhole-mailbox-server { }; + + magic-wormhole-transit-relay = callPackage ../development/python-modules/magic-wormhole-transit-relay { }; + + mahotas = callPackage ../development/python-modules/mahotas { }; + + mailcap-fix = callPackage ../development/python-modules/mailcap-fix { }; + + mailchimp = callPackage ../development/python-modules/mailchimp { }; + + maildir-deduplicate = callPackage ../development/python-modules/maildir-deduplicate { }; + + mailman = callPackage ../servers/mail/mailman { }; + + mailmanclient = callPackage ../development/python-modules/mailmanclient { }; + + mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { }; + + mailman-web = callPackage ../servers/mail/mailman/web.nix { }; + + mail-parser = callPackage ../development/python-modules/mail-parser { }; + + Mako = callPackage ../development/python-modules/Mako { }; + + managesieve = callPackage ../development/python-modules/managesieve { }; + + manhole = callPackage ../development/python-modules/manhole { }; + + manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix { }; + + manuel = callPackage ../development/python-modules/manuel { }; + + mapbox = callPackage ../development/python-modules/mapbox { }; + + mapsplotlib = callPackage ../development/python-modules/mapsplotlib { }; + + marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix { }; + + marionette-harness = callPackage ../development/python-modules/marionette-harness { }; + + marisa = callPackage ../development/python-modules/marisa { marisa = pkgs.marisa; }; marisa-trie = callPackage ../development/python-modules/marisa-trie { }; - Markups = callPackage ../development/python-modules/Markups { }; + markdown2 = callPackage ../development/python-modules/markdown2 { }; + + markdown = if isPy3k then + callPackage ../development/python-modules/markdown { } + else + callPackage ../development/python-modules/markdown/3_1.nix { }; + + markdown-macros = callPackage ../development/python-modules/markdown-macros { }; + + markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript { }; + + markerlib = callPackage ../development/python-modules/markerlib { }; markupsafe = callPackage ../development/python-modules/markupsafe { }; + Markups = callPackage ../development/python-modules/Markups { }; + marshmallow = callPackage ../development/python-modules/marshmallow { }; marshmallow-enum = callPackage ../development/python-modules/marshmallow-enum { }; @@ -4761,21 +3527,16 @@ in { marshmallow-sqlalchemy = callPackage ../development/python-modules/marshmallow-sqlalchemy { }; - manuel = callPackage ../development/python-modules/manuel { }; + mask-rcnn = callPackage ../development/python-modules/mask-rcnn { }; - mapsplotlib = callPackage ../development/python-modules/mapsplotlib { }; + matchpy = callPackage ../development/python-modules/matchpy { }; - markdown = if isPy3k then - callPackage ../development/python-modules/markdown { } - else - callPackage ../development/python-modules/markdown/3_1.nix { }; - - markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript {}; - - markdown-macros = callPackage ../development/python-modules/markdown-macros { }; + mathlibtools = callPackage ../development/python-modules/mathlibtools { }; matplotlib = let - path = if isPy3k then ../development/python-modules/matplotlib/default.nix else + path = if isPy3k then + ../development/python-modules/matplotlib/default.nix + else ../development/python-modules/matplotlib/2.nix; in callPackage path { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; @@ -4788,8 +3549,11 @@ in { matrix-nio = callPackage ../development/python-modules/matrix-nio { }; mautrix = callPackage ../development/python-modules/mautrix { }; + mautrix-appservice = self.mautrix; # alias 2019-12-28 + maxminddb = callPackage ../development/python-modules/maxminddb { }; + maya = callPackage ../development/python-modules/maya { }; mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { @@ -4799,87 +3563,94 @@ in { mccabe = callPackage ../development/python-modules/mccabe { }; - mechanize = callPackage ../development/python-modules/mechanize { }; + MDP = callPackage ../development/python-modules/mdp { }; + + measurement = callPackage ../development/python-modules/measurement { }; + + mecab-python3 = callPackage ../development/python-modules/mecab-python3 { }; MechanicalSoup = callPackage ../development/python-modules/MechanicalSoup { }; - meld3 = callPackage ../development/python-modules/meld3 { }; - - meliae = callPackage ../development/python-modules/meliae {}; + mechanize = callPackage ../development/python-modules/mechanize { }; meinheld = callPackage ../development/python-modules/meinheld { }; + meld3 = callPackage ../development/python-modules/meld3 { }; + + meliae = callPackage ../development/python-modules/meliae { }; + memcached = callPackage ../development/python-modules/memcached { }; memory_profiler = callPackage ../development/python-modules/memory_profiler { }; + mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override { python3Packages = self; })); + + merkletools = callPackage ../development/python-modules/merkletools { }; + mesa = callPackage ../development/python-modules/mesa { }; - meson = disabledIf (pythonOlder "3.5") (toPythonModule ((pkgs.meson.override { - python3 = python; - }).overrideAttrs(oldAttrs: { - # We do not want the setup hook in Python packages - # because the build is performed differently. - setupHook = null; - }))); + meshlabxml = callPackage ../development/python-modules/meshlabxml { }; + + meson = disabledIf (pythonOlder "3.5") (toPythonModule ((pkgs.meson.override { python3 = python; }).overrideAttrs + (oldAttrs: { # We do not want the setup hook in Python packages because the build is performed differently. + setupHook = null; + }))); mesonpep517 = callPackage ../development/python-modules/mesonpep517 { }; - meshlabxml = callPackage ../development/python-modules/meshlabxml { }; - metaphone = callPackage ../development/python-modules/metaphone { }; mezzanine = callPackage ../development/python-modules/mezzanine { }; micawber = callPackage ../development/python-modules/micawber { }; + midiutil = callPackage ../development/python-modules/midiutil { }; + + mido = callPackage ../development/python-modules/mido { }; + milksnake = callPackage ../development/python-modules/milksnake { }; + minidb = callPackage ../development/python-modules/minidb { }; + minimock = callPackage ../development/python-modules/minimock { }; + mininet-python = (toPythonModule (pkgs.mininet.override { inherit python; })).py; + minio = callPackage ../development/python-modules/minio { }; - moviepy = callPackage ../development/python-modules/moviepy { }; + miniupnpc = callPackage ../development/python-modules/miniupnpc { }; - mozterm = callPackage ../development/python-modules/mozterm { }; - - mplleaflet = callPackage ../development/python-modules/mplleaflet { }; - - multidict = callPackage ../development/python-modules/multidict { }; - - munch = callPackage ../development/python-modules/munch { }; - - nototools = callPackage ../data/fonts/noto-fonts/tools.nix { }; - - rainbowstream = callPackage ../development/python-modules/rainbowstream { }; - - pendulum = callPackage ../development/python-modules/pendulum { }; - - pocket = callPackage ../development/python-modules/pocket { }; + misaka = callPackage ../development/python-modules/misaka { }; mistune = callPackage ../development/python-modules/mistune { }; - brotlipy = callPackage ../development/python-modules/brotlipy { }; + mixpanel = callPackage ../development/python-modules/mixpanel { }; - sortedcollections = callPackage ../development/python-modules/sortedcollections { }; + mkl-service = callPackage ../development/python-modules/mkl-service { }; - hyperframe = callPackage ../development/python-modules/hyperframe { }; + mlflow = callPackage ../development/python-modules/mlflow { }; - h2 = callPackage ../development/python-modules/h2 { }; + mlrose = callPackage ../development/python-modules/mlrose { }; - editorconfig = callPackage ../development/python-modules/editorconfig { }; + mmh3 = callPackage ../development/python-modules/mmh3 { }; + + mmpython = callPackage ../development/python-modules/mmpython { }; + + mnemonic = callPackage ../development/python-modules/mnemonic { }; + + mnist = callPackage ../development/python-modules/mnist { }; + + mocket = callPackage ../development/python-modules/mocket { }; mock = if pythonOlder "3.6" then callPackage ../development/python-modules/mock/2.nix { } else callPackage ../development/python-modules/mock { }; - mocket = callPackage ../development/python-modules/mocket { }; + mockito = callPackage ../development/python-modules/mockito { }; mock-open = callPackage ../development/python-modules/mock-open { }; - mockito = callPackage ../development/python-modules/mockito { }; - modeled = callPackage ../development/python-modules/modeled { }; moderngl = callPackage ../development/python-modules/moderngl { }; @@ -4888,55 +3659,151 @@ in { modestmaps = callPackage ../development/python-modules/modestmaps { }; - # Needed here because moinmoin is loaded as a Python library. - moinmoin = callPackage ../development/python-modules/moinmoin { }; + moinmoin = callPackage ../development/python-modules/moinmoin + { }; # Needed here because moinmoin is loaded as a Python library. + + mongodict = callPackage ../development/python-modules/mongodict { }; + + mongoengine = callPackage ../development/python-modules/mongoengine { }; + + monkeyhex = callPackage ../development/python-modules/monkeyhex { }; + + monosat = disabledIf (!isPy3k) (pkgs.monosat.python { + inherit buildPythonPackage; + inherit (self) cython; + }); + + monotonic = callPackage ../development/python-modules/monotonic { }; + + monty = callPackage ../development/python-modules/monty { }; + + more-itertools = if isPy27 then + callPackage ../development/python-modules/more-itertools/2.7.nix { } + else + callPackage ../development/python-modules/more-itertools { }; moretools = callPackage ../development/python-modules/moretools { }; - moto = callPackage ../development/python-modules/moto {}; + morphys = callPackage ../development/python-modules/morphys { }; + + mortgage = callPackage ../development/python-modules/mortgage { }; + + moto = callPackage ../development/python-modules/moto { }; + + moviepy = callPackage ../development/python-modules/moviepy { }; + + mox3 = callPackage ../development/python-modules/mox3 { }; mox = callPackage ../development/python-modules/mox { }; + mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix { }; + + mozdevice = callPackage ../development/python-modules/marionette-harness/mozdevice.nix { }; + + mozfile = callPackage ../development/python-modules/marionette-harness/mozfile.nix { }; + + mozhttpd = callPackage ../development/python-modules/marionette-harness/mozhttpd.nix { }; + + mozinfo = callPackage ../development/python-modules/marionette-harness/mozinfo.nix { }; + + mozlog = callPackage ../development/python-modules/marionette-harness/mozlog.nix { }; + + moznetwork = callPackage ../development/python-modules/marionette-harness/moznetwork.nix { }; + + mozprocess = callPackage ../development/python-modules/marionette-harness/mozprocess.nix { }; + + mozprofile = callPackage ../development/python-modules/marionette-harness/mozprofile.nix { }; + + mozrunner = callPackage ../development/python-modules/marionette-harness/mozrunner.nix { }; + mozsvc = callPackage ../development/python-modules/mozsvc { }; - mpmath = callPackage ../development/python-modules/mpmath { }; + mozterm = callPackage ../development/python-modules/mozterm { }; - mpd = callPackage ../development/python-modules/mpd { }; + moztest = callPackage ../development/python-modules/marionette-harness/moztest.nix { }; + + mozversion = callPackage ../development/python-modules/marionette-harness/mozversion.nix { }; mpd2 = callPackage ../development/python-modules/mpd2 { }; + mpd = callPackage ../development/python-modules/mpd { }; + + mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.openmpi; }; + + mplleaflet = callPackage ../development/python-modules/mplleaflet { }; + + mpmath = callPackage ../development/python-modules/mpmath { }; + mpv = callPackage ../development/python-modules/mpv { mpv = pkgs.mpv; }; - mrbob = callPackage ../development/python-modules/mrbob {}; + mpyq = callPackage ../development/python-modules/mpyq { }; - msgpack = callPackage ../development/python-modules/msgpack {}; + mrbob = callPackage ../development/python-modules/mrbob { }; - msgpack-numpy = callPackage ../development/python-modules/msgpack-numpy {}; + msal = callPackage ../development/python-modules/msal { }; + + msal-extensions = callPackage ../development/python-modules/msal-extensions { }; + + msgpack = callPackage ../development/python-modules/msgpack { }; + + msgpack-numpy = callPackage ../development/python-modules/msgpack-numpy { }; + + msrestazure = callPackage ../development/python-modules/msrestazure { }; + + msrest = callPackage ../development/python-modules/msrest { }; msrplib = callPackage ../development/python-modules/msrplib { }; + mt-940 = callPackage ../development/python-modules/mt-940 { }; + + multidict = callPackage ../development/python-modules/multidict { }; + + multi_key_dict = callPackage ../development/python-modules/multi_key_dict { }; + multipledispatch = callPackage ../development/python-modules/multipledispatch { }; multiprocess = callPackage ../development/python-modules/multiprocess { }; + multiset = callPackage ../development/python-modules/multiset { }; + multitasking = callPackage ../development/python-modules/multitasking { }; + munch = callPackage ../development/python-modules/munch { }; + munkres = callPackage ../development/python-modules/munkres { }; + murmurhash = callPackage ../development/python-modules/murmurhash { }; + musicbrainzngs = callPackage ../development/python-modules/musicbrainzngs { }; mutag = callPackage ../development/python-modules/mutag { }; mutagen = if isPy27 then - callPackage ../development/python-modules/mutagen/1.43.nix { } - else - callPackage ../development/python-modules/mutagen { }; + callPackage ../development/python-modules/mutagen/1.43.nix { } + else + callPackage ../development/python-modules/mutagen { }; + + mutatormath = callPackage ../development/python-modules/mutatormath { }; muttils = callPackage ../development/python-modules/muttils { }; - mygpoclient = callPackage ../development/python-modules/mygpoclient { }; + mwclient = callPackage ../development/python-modules/mwclient { }; - mysqlclient = callPackage ../development/python-modules/mysqlclient { }; + mwlib = callPackage ../development/python-modules/mwlib { }; + + mwlib-ext = callPackage ../development/python-modules/mwlib-ext { }; + + mwlib-rl = callPackage ../development/python-modules/mwlib-rl { }; + + mwoauth = callPackage ../development/python-modules/mwoauth { }; + + mwparserfromhell = callPackage ../development/python-modules/mwparserfromhell { }; + + mxnet = callPackage ../development/python-modules/mxnet { }; + + myfitnesspal = callPackage ../development/python-modules/myfitnesspal { }; + + mygpoclient = callPackage ../development/python-modules/mygpoclient { }; mypy = callPackage ../development/python-modules/mypy { }; @@ -4944,44 +3811,12 @@ in { mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { }; - neuronpy = callPackage ../development/python-modules/neuronpy { }; - - persisting-theory = callPackage ../development/python-modules/persisting-theory { }; - - pint = callPackage ../development/python-modules/pint { }; - - pkutils = callPackage ../development/python-modules/pkutils { }; - - pygal = callPackage ../development/python-modules/pygal { }; - - pygogo = callPackage ../development/python-modules/pygogo { }; - - pytaglib = callPackage ../development/python-modules/pytaglib { }; - - pyte = callPackage ../development/python-modules/pyte { }; - - graphviz = callPackage ../development/python-modules/graphviz { - inherit (pkgs) graphviz; - }; - - pygraphviz = callPackage ../development/python-modules/pygraphviz { - inherit (pkgs) graphviz pkgconfig; # not the python package - }; - - pymc3 = callPackage ../development/python-modules/pymc3 { }; - - pympler = callPackage ../development/python-modules/pympler { }; - - pymysqlsa = callPackage ../development/python-modules/pymysqlsa { }; - - merkletools = callPackage ../development/python-modules/merkletools { }; - - monosat = disabledIf (!isPy3k) (pkgs.monosat.python { inherit buildPythonPackage; inherit (self) cython; }); - - monotonic = callPackage ../development/python-modules/monotonic { }; + mysqlclient = callPackage ../development/python-modules/mysqlclient { }; mysql-connector = callPackage ../development/python-modules/mysql-connector { }; + nagiosplugin = callPackage ../development/python-modules/nagiosplugin { }; + namebench = callPackage ../development/python-modules/namebench { }; namedlist = callPackage ../development/python-modules/namedlist { }; @@ -4990,33 +3825,69 @@ in { names = callPackage ../development/python-modules/names { }; + nanoleaf = callPackage ../development/python-modules/nanoleaf { }; + + nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; }; + + nanotime = callPackage ../development/python-modules/nanotime { }; + + nassl = callPackage ../development/python-modules/nassl { }; + + natsort = callPackage ../development/python-modules/natsort { }; + + naturalsort = callPackage ../development/python-modules/naturalsort { }; + nbclient = callPackage ../development/python-modules/nbclient { }; nbconflux = callPackage ../development/python-modules/nbconflux { }; nbconvert = callPackage ../development/python-modules/nbconvert { }; + nbdime = callPackage ../development/python-modules/nbdime { }; + nbformat = if isPy3k then callPackage ../development/python-modules/nbformat { } - else callPackage ../development/python-modules/nbformat/2.nix { }; + else + callPackage ../development/python-modules/nbformat/2.nix { }; nbmerge = callPackage ../development/python-modules/nbmerge { }; - nbdime = callPackage ../development/python-modules/nbdime { }; + nbsmoke = callPackage ../development/python-modules/nbsmoke { }; + + nbsphinx = callPackage ../development/python-modules/nbsphinx { }; + + nbval = callPackage ../development/python-modules/nbval { }; nbxmpp = callPackage ../development/python-modules/nbxmpp { }; - sleekxmpp = callPackage ../development/python-modules/sleekxmpp { }; + ncclient = callPackage ../development/python-modules/ncclient { }; - slixmpp = callPackage ../development/python-modules/slixmpp { - inherit (pkgs) gnupg; - }; + ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { }; + + ndtypes = callPackage ../development/python-modules/ndtypes { }; + + neo = callPackage ../development/python-modules/neo { }; + + nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; netaddr = callPackage ../development/python-modules/netaddr { }; + netcdf4 = callPackage ../development/python-modules/netcdf4 { }; + + netdisco = callPackage ../development/python-modules/netdisco { }; + netifaces = callPackage ../development/python-modules/netifaces { }; - hpack = callPackage ../development/python-modules/hpack { }; + networkx = if isPy3k then + callPackage ../development/python-modules/networkx { } + else + callPackage ../development/python-modules/networkx/2.2.nix { }; + + neuron-mpi = pkgs.neuron-mpi.override { inherit python; }; + + neuron = pkgs.neuron.override { inherit python; }; + + neuronpy = callPackage ../development/python-modules/neuronpy { }; nevow = callPackage ../development/python-modules/nevow { }; @@ -5026,563 +3897,945 @@ in { enablePython = true; })).python; - nibabel = callPackage ../development/python-modules/nibabel {}; + nibabel = callPackage ../development/python-modules/nibabel { }; nidaqmx = callPackage ../development/python-modules/nidaqmx { }; - nilearn = callPackage ../development/python-modules/nilearn {}; + Nikola = callPackage ../development/python-modules/Nikola { }; - nimfa = callPackage ../development/python-modules/nimfa {}; + nilearn = callPackage ../development/python-modules/nilearn { }; + + nimfa = callPackage ../development/python-modules/nimfa { }; + + nine = callPackage ../development/python-modules/nine { }; nipy = callPackage ../development/python-modules/nipy { }; - nipype = callPackage ../development/python-modules/nipype { - inherit (pkgs) which; - }; + nipype = callPackage ../development/python-modules/nipype { inherit (pkgs) which; }; nitime = callPackage ../development/python-modules/nitime { }; - nix-kernel = callPackage ../development/python-modules/nix-kernel { - inherit (pkgs) nix; - }; + nitpick = callPackage ../applications/version-management/nitpick { }; + + nix-kernel = callPackage ../development/python-modules/nix-kernel { inherit (pkgs) nix; }; + + nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 + { }; # This is used for NixOps to make sure we won't break it with the next major version of nixpart. + + nixpart = callPackage ../tools/filesystems/nixpart { }; nixpkgs = callPackage ../development/python-modules/nixpkgs { }; nixpkgs-pytools = callPackage ../development/python-modules/nixpkgs-pytools { }; + nix-prefetch-github = callPackage ../development/python-modules/nix-prefetch-github { }; + + nltk = callPackage ../development/python-modules/nltk { }; + + nmigen-boards = callPackage ../development/python-modules/nmigen-boards { }; + + nmigen = callPackage ../development/python-modules/nmigen { }; + + nmigen-soc = callPackage ../development/python-modules/nmigen-soc { }; + nodeenv = callPackage ../development/python-modules/nodeenv { }; + node-semver = callPackage ../development/python-modules/node-semver { }; + + noise = callPackage ../development/python-modules/noise { }; + + nose2 = callPackage ../development/python-modules/nose2 { }; + nose = callPackage ../development/python-modules/nose { }; nose-cov = callPackage ../development/python-modules/nose-cov { }; + nose-cover3 = callPackage ../development/python-modules/nose-cover3 { }; + + nose-cprof = callPackage ../development/python-modules/nose-cprof { }; + nose-exclude = callPackage ../development/python-modules/nose-exclude { }; nose-focus = callPackage ../development/python-modules/nose-focus { }; - nose-randomly = callPackage ../development/python-modules/nose-randomly { }; - - nose2 = callPackage ../development/python-modules/nose2 { }; - - nose-cover3 = callPackage ../development/python-modules/nose-cover3 { }; - - nosexcover = callPackage ../development/python-modules/nosexcover { }; - nosejs = callPackage ../development/python-modules/nosejs { }; - nose-cprof = callPackage ../development/python-modules/nose-cprof { }; - nose-of-yeti = callPackage ../development/python-modules/nose-of-yeti { }; nose-pattern-exclude = callPackage ../development/python-modules/nose-pattern-exclude { }; + nose_progressive = callPackage ../development/python-modules/nose_progressive { }; + + nose-randomly = callPackage ../development/python-modules/nose-randomly { }; + nose_warnings_filters = callPackage ../development/python-modules/nose_warnings_filters { }; - notebook = if isPy3k then callPackage ../development/python-modules/notebook { } - else callPackage ../development/python-modules/notebook/2.nix { }; + nosexcover = callPackage ../development/python-modules/nosexcover { }; + + notebook = if isPy3k then + callPackage ../development/python-modules/notebook { } + else + callPackage ../development/python-modules/notebook/2.nix { }; notedown = callPackage ../development/python-modules/notedown { }; + notify2 = callPackage ../development/python-modules/notify2 { }; + notify = callPackage ../development/python-modules/notify { }; - notify2 = callPackage ../development/python-modules/notify2 {}; + notmuch = callPackage ../development/python-modules/notmuch { inherit (pkgs) notmuch; }; - notmuch = callPackage ../development/python-modules/notmuch { - inherit (pkgs) notmuch; - }; + nototools = callPackage ../data/fonts/noto-fonts/tools.nix { }; - emoji = callPackage ../development/python-modules/emoji { }; + nplusone = callPackage ../development/python-modules/nplusone { }; + + ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; ntplib = callPackage ../development/python-modules/ntplib { }; + Nuitka = callPackage ../development/python-modules/nuitka { }; + num2words = callPackage ../development/python-modules/num2words { }; numba = callPackage ../development/python-modules/numba { }; - numcodecs = callPackage ../development/python-modules/numcodecs { - inherit (pkgs) gcc8; - }; + numcodecs = callPackage ../development/python-modules/numcodecs { inherit (pkgs) gcc8; }; + + numericalunits = callPackage ../development/python-modules/numericalunits { }; numexpr = callPackage ../development/python-modules/numexpr { }; - Nuitka = callPackage ../development/python-modules/nuitka { }; - - numpy = - if pythonOlder "3.5" then - callPackage ../development/python-modules/numpy/1.16.nix { } - else - callPackage ../development/python-modules/numpy { }; - numpydoc = callPackage ../development/python-modules/numpydoc { }; + numpy = if pythonOlder "3.5" then + callPackage ../development/python-modules/numpy/1.16.nix { } + else + callPackage ../development/python-modules/numpy { }; + numpy-stl = callPackage ../development/python-modules/numpy-stl { }; numtraits = callPackage ../development/python-modules/numtraits { }; + nunavut = callPackage ../development/python-modules/nunavut { }; + + nvchecker = callPackage ../development/python-modules/nvchecker { }; + nwdiag = callPackage ../development/python-modules/nwdiag { }; - dynd = callPackage ../development/python-modules/dynd { }; + nxt-python = callPackage ../development/python-modules/nxt-python { }; - langcodes = callPackage ../development/python-modules/langcodes { }; - - livestreamer = callPackage ../development/python-modules/livestreamer { }; - - livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { }; - - oauth = callPackage ../development/python-modules/oauth { }; + oath = callPackage ../development/python-modules/oath { }; oauth2 = callPackage ../development/python-modules/oauth2 { }; oauth2client = callPackage ../development/python-modules/oauth2client { }; + oauth = callPackage ../development/python-modules/oauth { }; + + oauthenticator = callPackage ../development/python-modules/oauthenticator { }; + oauthlib = if isPy27 then - callPackage ../development/python-modules/oauthlib/3.1.nix { } - else - callPackage ../development/python-modules/oauthlib { }; + callPackage ../development/python-modules/oauthlib/3.1.nix { } + else + callPackage ../development/python-modules/oauthlib { }; obfsproxy = callPackage ../development/python-modules/obfsproxy { }; - objgraph = callPackage ../development/python-modules/objgraph { - graphvizPkg = pkgs.graphviz; - }; + objgraph = callPackage ../development/python-modules/objgraph { graphvizPkg = pkgs.graphviz; }; + + od = callPackage ../development/python-modules/od { }; + + odfpy = callPackage ../development/python-modules/odfpy { }; offtrac = callPackage ../development/python-modules/offtrac { }; + ofxclient = callPackage ../development/python-modules/ofxclient { }; + + ofxhome = callPackage ../development/python-modules/ofxhome { }; + + ofxparse = callPackage ../development/python-modules/ofxparse { }; + + ofxtools = callPackage ../development/python-modules/ofxtools { }; + + olefile = callPackage ../development/python-modules/olefile { }; + + omegaconf = callPackage ../development/python-modules/omegaconf { }; + + onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { }; + + onnx = callPackage ../development/python-modules/onnx { }; + + openant = callPackage ../development/python-modules/openant { }; + + openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { }; + + opencv3 = toPythonModule (pkgs.opencv3.override { + enablePython = true; + pythonPackages = self; + }); + + opencv4 = toPythonModule (pkgs.opencv4.override { + enablePython = true; + pythonPackages = self; + }); + + opencv = disabledIf isPy3k (toPythonModule (pkgs.opencv.override { + enablePython = true; + pythonPackages = self; + })); + + openidc-client = callPackage ../development/python-modules/openidc-client { }; + openpyxl = if pythonAtLeast "3.6" then callPackage ../development/python-modules/openpyxl { } else callPackage ../development/python-modules/openpyxl/2.nix { }; + openrazer = callPackage ../development/python-modules/openrazer/pylib.nix { }; + + openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { }; + opentimestamps = callPackage ../development/python-modules/opentimestamps { }; - ordereddict = callPackage ../development/python-modules/ordereddict { }; + opentracing = callPackage ../development/python-modules/opentracing { }; - od = callPackage ../development/python-modules/od { }; + openwebifpy = callPackage ../development/python-modules/openwebifpy { }; - omegaconf = callPackage ../development/python-modules/omegaconf { }; + openwrt-luci-rpc = disabledIf (!isPy3k) (callPackage ../development/python-modules/openwrt-luci-rpc { }); + + opt-einsum = if isPy27 then + callPackage ../development/python-modules/opt-einsum/2.nix { } + else + callPackage ../development/python-modules/opt-einsum { }; + + optuna = callPackage ../development/python-modules/optuna { }; opuslib = callPackage ../development/python-modules/opuslib { }; + ordereddict = callPackage ../development/python-modules/ordereddict { }; + + orderedmultidict = callPackage ../development/python-modules/orderedmultidict { }; + + ordered-set = callPackage ../development/python-modules/ordered-set { }; + orderedset = callPackage ../development/python-modules/orderedset { }; - python-multipart = callPackage ../development/python-modules/python-multipart { }; + orm = callPackage ../development/python-modules/orm { }; - python-otr = callPackage ../development/python-modules/python-otr { }; - - plone-testing = callPackage ../development/python-modules/plone-testing { }; - - ply = callPackage ../development/python-modules/ply { }; - - plyplus = callPackage ../development/python-modules/plyplus { }; - - plyvel = callPackage ../development/python-modules/plyvel { }; + ortools = (toPythonModule (pkgs.or-tools.override { inherit (self) python; })).python; osc = callPackage ../development/python-modules/osc { }; - rfc3986 = callPackage ../development/python-modules/rfc3986 { }; + oscrypto = callPackage ../development/python-modules/oscrypto { }; - cachetools = let - cachetools' = callPackage ../development/python-modules/cachetools {}; - cachetools_2 = cachetools'.overridePythonAttrs(oldAttrs: rec { - version = "3.1.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "16m69l6n6y1r1y7cklm92rr7v69ldig2n3lbl3j323w5jz7d78lf"; - }; + oset = callPackage ../development/python-modules/oset { }; - }); - in if isPy3k then cachetools' else cachetools_2; + osmnx = callPackage ../development/python-modules/osmnx { }; - cma = callPackage ../development/python-modules/cma { }; + osmpythontools = callPackage ../development/python-modules/osmpythontools { }; - cmd2 = callPackage ../development/python-modules/cmd2 {}; + osqp = callPackage ../development/python-modules/osqp { }; - warlock = callPackage ../development/python-modules/warlock { }; + outcome = callPackage ../development/python-modules/outcome { }; - pecan = callPackage ../development/python-modules/pecan { }; + ovh = callPackage ../development/python-modules/ovh { }; - kaitaistruct = callPackage ../development/python-modules/kaitaistruct { }; + ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; }); - Kajiki = callPackage ../development/python-modules/kajiki { }; + owslib = callPackage ../development/python-modules/owslib { }; - WSME = callPackage ../development/python-modules/WSME { }; + oyaml = callPackage ../development/python-modules/oyaml { }; - zake = callPackage ../development/python-modules/zake { }; + packaging = callPackage ../development/python-modules/packaging { }; - zarr = callPackage ../development/python-modules/zarr { }; + packet-python = callPackage ../development/python-modules/packet-python { }; - kazoo = callPackage ../development/python-modules/kazoo { }; + pafy = callPackage ../development/python-modules/pafy { }; - FormEncode = callPackage ../development/python-modules/FormEncode { }; - - pycountry = callPackage ../development/python-modules/pycountry { }; - - nine = callPackage ../development/python-modules/nine { }; - - logutils = callPackage ../development/python-modules/logutils { }; - - ldappool = callPackage ../development/python-modules/ldappool { }; - - retrying = callPackage ../development/python-modules/retrying { }; - - fasteners = callPackage ../development/python-modules/fasteners { }; - - aiocontextvars = callPackage ../development/python-modules/aiocontextvars { }; - - aioeventlet = callPackage ../development/python-modules/aioeventlet { }; - - aiokafka = callPackage ../development/python-modules/aiokafka { }; - - olefile = callPackage ../development/python-modules/olefile { }; - - requests-mock = callPackage ../development/python-modules/requests-mock { }; - - mecab-python3 = callPackage ../development/python-modules/mecab-python3 { }; - - mox3 = callPackage ../development/python-modules/mox3 { }; - - doc8 = callPackage ../development/python-modules/doc8 { }; - - wrapt = callPackage ../development/python-modules/wrapt { }; + pagelabels = callPackage ../development/python-modules/pagelabels { }; pagerduty = callPackage ../development/python-modules/pagerduty { }; + paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; + + palettable = callPackage ../development/python-modules/palettable { }; + + pam = callPackage ../development/python-modules/pam { inherit (pkgs) pam; }; + + pamela = callPackage ../development/python-modules/pamela { }; + + pamqp = callPackage ../development/python-modules/pamqp { }; + pandas = if isPy3k then callPackage ../development/python-modules/pandas { } else callPackage ../development/python-modules/pandas/2.nix { }; + pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { }; + + pandocfilters = callPackage ../development/python-modules/pandocfilters { }; + panel = callPackage ../development/python-modules/panel { }; - xlrd = callPackage ../development/python-modules/xlrd { }; + papermill = callPackage ../development/python-modules/papermill { }; - bottleneck = callPackage ../development/python-modules/bottleneck { }; + paperspace = callPackage ../development/python-modules/paperspace { }; - paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; + paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { }; - pagelabels = callPackage ../development/python-modules/pagelabels { }; + papis = callPackage ../development/python-modules/papis { }; - pamqp = callPackage ../development/python-modules/pamqp { }; - - parsedatetime = callPackage ../development/python-modules/parsedatetime { }; + papis-python-rofi = callPackage ../development/python-modules/papis-python-rofi { }; param = callPackage ../development/python-modules/param { }; - paramiko = callPackage ../development/python-modules/paramiko { }; - parameterized = callPackage ../development/python-modules/parameterized { }; + paramiko = callPackage ../development/python-modules/paramiko { }; + paramz = callPackage ../development/python-modules/paramz { }; parfive = callPackage ../development/python-modules/parfive { }; + parse = callPackage ../development/python-modules/parse { }; + + parsedatetime = callPackage ../development/python-modules/parsedatetime { }; + parsel = callPackage ../development/python-modules/parsel { }; + parse-type = callPackage ../development/python-modules/parse-type { }; + + parsimonious = callPackage ../development/python-modules/parsimonious { }; + + parsley = callPackage ../development/python-modules/parsley { }; + parso = callPackage ../development/python-modules/parso { }; + parsy = callPackage ../development/python-modules/parsy { }; + partd = callPackage ../development/python-modules/partd { }; - patch = callPackage ../development/python-modules/patch { }; + parver = callPackage ../development/python-modules/parver { }; + arpeggio = callPackage ../development/python-modules/arpeggio { }; - patch-ng = callPackage ../development/python-modules/patch-ng { }; - - pathos = callPackage ../development/python-modules/pathos { }; - - patsy = callPackage ../development/python-modules/patsy { }; + passlib = callPackage ../development/python-modules/passlib { }; paste = callPackage ../development/python-modules/paste { }; PasteDeploy = callPackage ../development/python-modules/pastedeploy { }; + pastel = callPackage ../development/python-modules/pastel { }; + pasteScript = callPackage ../development/python-modules/pastescript { }; patator = callPackage ../development/python-modules/patator { }; + patch = callPackage ../development/python-modules/patch { }; + + patch-ng = callPackage ../development/python-modules/patch-ng { }; + + path-and-address = callPackage ../development/python-modules/path-and-address { }; + pathlib2 = callPackage ../development/python-modules/pathlib2 { }; + pathlib = callPackage ../development/python-modules/pathlib { }; + + pathos = callPackage ../development/python-modules/pathos { }; + pathpy = if isPy3k then callPackage ../development/python-modules/path.py { } else callPackage ../development/python-modules/path.py/2.nix { }; + pathspec = callPackage ../development/python-modules/pathspec { }; + + pathtools = callPackage ../development/python-modules/pathtools { }; + + patsy = callPackage ../development/python-modules/patsy { }; + + paver = callPackage ../development/python-modules/paver { }; + paypalrestsdk = callPackage ../development/python-modules/paypalrestsdk { }; + pbkdf2 = callPackage ../development/python-modules/pbkdf2 { }; + pbr = callPackage ../development/python-modules/pbr { }; - fixtures = callPackage ../development/python-modules/fixtures { }; + pc-ble-driver-py = toPythonModule (callPackage ../development/python-modules/pc-ble-driver-py { }); - fipy = callPackage ../development/python-modules/fipy { }; + pcpp = callPackage ../development/python-modules/pcpp { }; - sfepy = callPackage ../development/python-modules/sfepy { }; + pdf2image = callPackage ../development/python-modules/pdf2image { }; - pelican = callPackage ../development/python-modules/pelican { - inherit (pkgs) glibcLocales git; - }; + pdfkit = callPackage ../development/python-modules/pdfkit { }; - pep8 = callPackage ../development/python-modules/pep8 { }; + pdfminer = callPackage ../development/python-modules/pdfminer_six { }; - pep8-naming = callPackage ../development/python-modules/pep8-naming { }; + pdfposter = callPackage ../development/python-modules/pdfposter { }; + + pdfrw = callPackage ../development/python-modules/pdfrw { }; + + pdftotext = callPackage ../development/python-modules/pdftotext { }; + + pdfx = callPackage ../development/python-modules/pdfx { }; + + pecan = callPackage ../development/python-modules/pecan { }; + + peewee = callPackage ../development/python-modules/peewee { }; + + pefile = callPackage ../development/python-modules/pefile { }; + + pelican = callPackage ../development/python-modules/pelican { inherit (pkgs) glibcLocales git; }; + + pendulum = callPackage ../development/python-modules/pendulum { }; pep257 = callPackage ../development/python-modules/pep257 { }; pep517 = callPackage ../development/python-modules/pep517 { }; + pep8 = callPackage ../development/python-modules/pep8 { }; + + pep8-naming = callPackage ../development/python-modules/pep8-naming { }; + + peppercorn = callPackage ../development/python-modules/peppercorn { }; + percol = callPackage ../development/python-modules/percol { }; + perfplot = callPackage ../development/python-modules/perfplot { }; + + periodictable = callPackage ../development/python-modules/periodictable { }; + + persim = callPackage ../development/python-modules/persim { }; + + persistent = callPackage ../development/python-modules/persistent { }; + + persisting-theory = callPackage ../development/python-modules/persisting-theory { }; + + pex = callPackage ../development/python-modules/pex { }; + pexif = callPackage ../development/python-modules/pexif { }; pexpect = callPackage ../development/python-modules/pexpect { }; - pdfkit = callPackage ../development/python-modules/pdfkit { }; - - pdfrw = callPackage ../development/python-modules/pdfrw { }; - - periodictable = callPackage ../development/python-modules/periodictable { }; - - pgcli = callPackage ../development/tools/database/pgcli {}; - pg8000 = callPackage ../development/python-modules/pg8000 { }; pg8000_1_12 = callPackage ../development/python-modules/pg8000/1_12.nix { }; + pgcli = callPackage ../development/tools/database/pgcli { }; + pglast = callPackage ../development/python-modules/pglast { }; + pgpdump = callPackage ../development/python-modules/pgpdump { }; + + pgpy = callPackage ../development/python-modules/pgpy { }; + pgsanity = callPackage ../development/python-modules/pgsanity { }; pgspecial = callPackage ../development/python-modules/pgspecial { }; - pgpy = callPackage ../development/python-modules/pgpy { }; + phe = callPackage ../development/python-modules/phe { }; + + phik = callPackage ../development/python-modules/phik { }; + + phonenumbers = callPackage ../development/python-modules/phonenumbers { }; + + phonopy = callPackage ../development/python-modules/phonopy { }; + + phpserialize = callPackage ../development/python-modules/phpserialize { }; + + piccata = callPackage ../development/python-modules/piccata { }; pickleshare = callPackage ../development/python-modules/pickleshare { }; picos = callPackage ../development/python-modules/picos { }; + pid = callPackage ../development/python-modules/pid { }; + piep = callPackage ../development/python-modules/piep { }; piexif = callPackage ../development/python-modules/piexif { }; - pip = callPackage ../development/python-modules/pip { }; - - pipx = callPackage ../development/python-modules/pipx { }; - - pip-tools = callPackage ../development/python-modules/pip-tools { - git = pkgs.gitMinimal; - glibcLocales = pkgs.glibcLocales; - }; - - pipdate = callPackage ../development/python-modules/pipdate { }; - pika = callPackage ../development/python-modules/pika { }; pika-pool = callPackage ../development/python-modules/pika-pool { }; pikepdf = callPackage ../development/python-modules/pikepdf { }; - kmapper = callPackage ../development/python-modules/kmapper { }; + pilkit = callPackage ../development/python-modules/pilkit { }; - kmsxx = toPythonModule ((callPackage ../development/libraries/kmsxx { - inherit (pkgs.kmsxx) stdenv; - inherit (pkgs) pkgconfig; - withPython = true; - }).overrideAttrs (oldAttrs: { - name = "${python.libPrefix}-${pkgs.kmsxx.name}"; - })); - - precis-i18n = callPackage ../development/python-modules/precis-i18n { }; - - promise = callPackage ../development/python-modules/promise { }; - - prox-tv = callPackage ../development/python-modules/prox-tv { }; - - pvlib = callPackage ../development/python-modules/pvlib { }; - - pybase64 = callPackage ../development/python-modules/pybase64 { }; - - pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { }; - - pylibmc = callPackage ../development/python-modules/pylibmc {}; - - pymetar = callPackage ../development/python-modules/pymetar { }; - - pypubsub = callPackage ../development/python-modules/pypubsub { }; - - pysftp = callPackage ../development/python-modules/pysftp { }; - - soundfile = callPackage ../development/python-modules/soundfile { }; - - pysoundfile = self.soundfile; # Alias added 23-06-2019 - - python-jenkins = callPackage ../development/python-modules/python-jenkins { }; - - pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; - - pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; + pillowfight = callPackage ../development/python-modules/pillowfight { }; pillow = if isPy27 then callPackage ../development/python-modules/pillow/6.nix { inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; inherit (pkgs.xorg) libX11; - } else + } + else callPackage ../development/python-modules/pillow { inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; inherit (pkgs.xorg) libX11; + }; + + pims = callPackage ../development/python-modules/pims { }; + + pint = callPackage ../development/python-modules/pint { }; + + pip2nix = callPackage ../development/python-modules/pip2nix { }; + + pip = callPackage ../development/python-modules/pip { }; + + pipdate = callPackage ../development/python-modules/pipdate { }; + + pip-tools = callPackage ../development/python-modules/pip-tools { + git = pkgs.gitMinimal; + glibcLocales = pkgs.glibcLocales; }; - pkgconfig = callPackage ../development/python-modules/pkgconfig { - inherit (pkgs) pkgconfig; - }; + pipx = callPackage ../development/python-modules/pipx { }; + + pivy = callPackage ../development/python-modules/pivy { }; + + pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkgconfig; }; + + pkginfo = callPackage ../development/python-modules/pkginfo { }; + + pkuseg = callPackage ../development/python-modules/pkuseg { }; + + pkutils = callPackage ../development/python-modules/pkutils { }; + + plac = callPackage ../development/python-modules/plac { }; + + plaid-python = callPackage ../development/python-modules/plaid-python { }; + + plaster = callPackage ../development/python-modules/plaster { }; + + plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy { }; + + playsound = callPackage ../development/python-modules/playsound { }; + + plexapi = callPackage ../development/python-modules/plexapi { }; + + plexauth = callPackage ../development/python-modules/plexauth { }; + + plexwebsocket = callPackage ../development/python-modules/plexwebsocket { }; + + plone-testing = callPackage ../development/python-modules/plone-testing { }; + + plotly = callPackage ../development/python-modules/plotly { }; + + pluggy = callPackage ../development/python-modules/pluggy { }; + + pluginbase = callPackage ../development/python-modules/pluginbase { }; plumbum = callPackage ../development/python-modules/plumbum { }; - polib = callPackage ../development/python-modules/polib {}; + ply = callPackage ../development/python-modules/ply { }; + + plyfile = callPackage ../development/python-modules/plyfile { }; + + plyplus = callPackage ../development/python-modules/plyplus { }; + + plyvel = callPackage ../development/python-modules/plyvel { }; + + Pmw = callPackage ../development/python-modules/Pmw { }; + + pocket = callPackage ../development/python-modules/pocket { }; + + podcastparser = callPackage ../development/python-modules/podcastparser { }; + + podcats = callPackage ../development/python-modules/podcats { }; + + poetry = callPackage ../development/python-modules/poetry { }; + + poetry-core = callPackage ../development/python-modules/poetry-core { }; + + poezio = callPackage ../applications/networking/instant-messengers/poezio { inherit (pkgs) pkgconfig; }; + + polib = callPackage ../development/python-modules/polib { }; + + polyline = callPackage ../development/python-modules/polyline { }; + + pomegranate = callPackage ../development/python-modules/pomegranate { }; + + pony = callPackage ../development/python-modules/pony { }; ponywhoosh = callPackage ../development/python-modules/ponywhoosh { }; - posix_ipc = callPackage ../development/python-modules/posix_ipc { }; + pooch = callPackage ../development/python-modules/pooch { }; + + poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { + inherit (pkgs.qt5) qtbase; + inherit (pkgs.libsForQt5) poppler; + inherit (pkgs) pkgconfig; + }; + + portalocker = callPackage ../development/python-modules/portalocker { }; portend = callPackage ../development/python-modules/portend { }; + portpicker = callPackage ../development/python-modules/portpicker { }; + + posix_ipc = callPackage ../development/python-modules/posix_ipc { }; + + poster3 = callPackage ../development/python-modules/poster3 { }; + + postorius = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/postorius.nix { }); + + potr = callPackage ../development/python-modules/potr { }; + + power = callPackage ../development/python-modules/power { }; + powerline = callPackage ../development/python-modules/powerline { }; pox = callPackage ../development/python-modules/pox { }; + poyo = callPackage ../development/python-modules/poyo { }; + ppft = callPackage ../development/python-modules/ppft { }; + pplpy = callPackage ../development/python-modules/pplpy { }; + + pprintpp = callPackage ../development/python-modules/pprintpp { }; + pproxy = callPackage ../development/python-modules/pproxy { }; pq = callPackage ../development/python-modules/pq { }; - praw = if isPy3k then callPackage ../development/python-modules/praw { } - else callPackage ../development/python-modules/praw/6.3.nix { }; - prance = callPackage ../development/python-modules/prance { }; prawcore = callPackage ../development/python-modules/prawcore { }; + praw = if isPy3k then + callPackage ../development/python-modules/praw { } + else + callPackage ../development/python-modules/praw/6.3.nix { }; + + precis-i18n = callPackage ../development/python-modules/precis-i18n { }; + + pre-commit = callPackage ../development/python-modules/pre-commit { }; + + preggy = callPackage ../development/python-modules/preggy { }; + premailer = callPackage ../development/python-modules/premailer { }; + preshed = callPackage ../development/python-modules/preshed { }; + + pretend = callPackage ../development/python-modules/pretend { }; + prettytable = callPackage ../development/python-modules/prettytable { }; - property-manager = callPackage ../development/python-modules/property-manager { }; + priority = callPackage ../development/python-modules/priority { }; + + prison = callPackage ../development/python-modules/prison { }; + + privacyidea = callPackage ../development/python-modules/privacyidea { }; + privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { }; + + proboscis = callPackage ../development/python-modules/proboscis { }; + + process-tests = callPackage ../development/python-modules/process-tests { }; + + proglog = callPackage ../development/python-modules/proglog { }; + + progressbar231 = callPackage ../development/python-modules/progressbar231 { }; + + progressbar2 = callPackage ../development/python-modules/progressbar2 { }; + + progressbar33 = callPackage ../development/python-modules/progressbar33 { }; + + progressbar = callPackage ../development/python-modules/progressbar { }; + + progress = callPackage ../development/python-modules/progress { }; + + prometheus_client = callPackage ../development/python-modules/prometheus_client { }; + + promise = callPackage ../development/python-modules/promise { }; prompt_toolkit = let - filename = if isPy3k then ../development/python-modules/prompt_toolkit else ../development/python-modules/prompt_toolkit/1.nix; + filename = if isPy3k then + ../development/python-modules/prompt_toolkit + else + ../development/python-modules/prompt_toolkit/1.nix; in callPackage filename { }; + property-manager = callPackage ../development/python-modules/property-manager { }; + + protego = callPackage ../development/python-modules/protego { }; + protobuf = callPackage ../development/python-modules/protobuf { disabled = isPyPy; - doCheck = !isPy3k; - # If a protobuf upgrade causes many Python packages to fail, please pin it - # here to the previous version. + doCheck = + !isPy3k; # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version. protobuf = pkgs.protobuf; }; + prov = callPackage ../development/python-modules/prov { }; + + prox-tv = callPackage ../development/python-modules/prox-tv { }; + + psautohint = callPackage ../development/python-modules/psautohint { }; + psd-tools = callPackage ../development/python-modules/psd-tools { }; psutil = callPackage ../development/python-modules/psutil { }; - psycopg2 = callPackage ../development/python-modules/psycopg2 {}; - - ptpython = callPackage ../development/python-modules/ptpython { - prompt_toolkit = self.prompt_toolkit; - }; + psycopg2 = callPackage ../development/python-modules/psycopg2 { }; ptable = callPackage ../development/python-modules/ptable { }; - publicsuffix = callPackage ../development/python-modules/publicsuffix {}; + ptest = callPackage ../development/python-modules/ptest { }; - publicsuffix2 = callPackage ../development/python-modules/publicsuffix2 {}; + ptpython = callPackage ../development/python-modules/ptpython { prompt_toolkit = self.prompt_toolkit; }; - py = callPackage ../development/python-modules/py { }; + ptyprocess = callPackage ../development/python-modules/ptyprocess { }; + + publicsuffix2 = callPackage ../development/python-modules/publicsuffix2 { }; + + publicsuffix = callPackage ../development/python-modules/publicsuffix { }; + + pudb = callPackage ../development/python-modules/pudb { }; + + pulp = callPackage ../development/python-modules/pulp { }; + + pulsectl = callPackage ../development/python-modules/pulsectl { }; + + pure-eval = callPackage ../development/python-modules/pure-eval { }; + + pure-pcapy3 = callPackage ../development/python-modules/pure-pcapy3 { }; + + purepng = callPackage ../development/python-modules/purepng { }; + + pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { }; + + purl = callPackage ../development/python-modules/purl { }; + + pushbullet = callPackage ../development/python-modules/pushbullet { }; + + pushover-complete = callPackage ../development/python-modules/pushover-complete { }; + + pvlib = callPackage ../development/python-modules/pvlib { }; + + Pweave = callPackage ../development/python-modules/pweave { }; + + pwntools = callPackage ../development/python-modules/pwntools { debugger = pkgs.gdb; }; + + pxml = callPackage ../development/python-modules/pxml { }; + + py2bit = callPackage ../development/python-modules/py2bit { }; + + py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); + + py3exiv2 = callPackage ../development/python-modules/py3exiv2 { }; + + py3status = callPackage ../development/python-modules/py3status { }; + + py3to2 = callPackage ../development/python-modules/3to2 { }; + + py4j = callPackage ../development/python-modules/py4j { }; pyacoustid = callPackage ../development/python-modules/pyacoustid { }; + pyaes = callPackage ../development/python-modules/pyaes { }; + + pyairvisual = callPackage ../development/python-modules/pyairvisual { }; + pyalgotrade = callPackage ../development/python-modules/pyalgotrade { }; + pyamf = callPackage ../development/python-modules/pyamf { }; + + pyamg = callPackage ../development/python-modules/pyamg { }; + + pyaml = callPackage ../development/python-modules/pyaml { }; + + pyannotate = callPackage ../development/python-modules/pyannotate { }; + + pyarrow = callPackage ../development/python-modules/pyarrow { inherit (pkgs) arrow-cpp cmake pkgconfig; }; + pyasn1 = callPackage ../development/python-modules/pyasn1 { }; pyasn1-modules = callPackage ../development/python-modules/pyasn1-modules { }; pyatmo = callPackage ../development/python-modules/pyatmo { }; + pyatspi = callPackage ../development/python-modules/pyatspi { inherit (pkgs) pkgconfig; }; + + pyatv = callPackage ../development/python-modules/pyatv { }; + pyaudio = callPackage ../development/python-modules/pyaudio { }; - pycoin = callPackage ../development/python-modules/pycoin { }; + pyavm = callPackage ../development/python-modules/pyavm { }; - pysam = callPackage ../development/python-modules/pysam { }; + pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { }; - pysaml2 = callPackage ../development/python-modules/pysaml2 { - inherit (pkgs) xmlsec; - }; + pybase64 = callPackage ../development/python-modules/pybase64 { }; - python-pushover = callPackage ../development/python-modules/pushover {}; - - pystemd = callPackage ../development/python-modules/pystemd { systemd = pkgs.systemd; }; - - mongodict = callPackage ../development/python-modules/mongodict { }; - - mongoengine = callPackage ../development/python-modules/mongoengine { }; - - repoze_who = callPackage ../development/python-modules/repoze_who { }; - - vobject = callPackage ../development/python-modules/vobject { }; - - pycarddav = callPackage ../development/python-modules/pycarddav { }; - - pygit2 = callPackage ../development/python-modules/pygit2 { }; - - Babel = callPackage ../development/python-modules/Babel { }; - - babelgladeextractor = callPackage ../development/python-modules/babelgladeextractor { }; - - batchspawner = callPackage ../development/python-modules/batchspawner { }; + pybids = callPackage ../development/python-modules/pybids { }; pybigwig = callPackage ../development/python-modules/pybigwig { }; - py2bit = callPackage ../development/python-modules/py2bit { }; + pybind11 = callPackage ../development/python-modules/pybind11 { }; + + pybindgen = callPackage ../development/python-modules/pybindgen { }; + + pyblake2 = callPackage ../development/python-modules/pyblake2 { }; pyblock = callPackage ../development/python-modules/pyblock { }; pyblosxom = callPackage ../development/python-modules/pyblosxom { }; + pybluez = callPackage ../development/python-modules/pybluez { }; + + pybotvac = callPackage ../development/python-modules/pybotvac { }; + + pybrowserid = callPackage ../development/python-modules/pybrowserid { }; + + pybtex = callPackage ../development/python-modules/pybtex { }; + + pybtex-docutils = callPackage ../development/python-modules/pybtex-docutils { }; + + pybullet = callPackage ../development/python-modules/pybullet { }; + + pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkgconfig; }; + + pycallgraph = callPackage ../development/python-modules/pycallgraph { }; + + py = callPackage ../development/python-modules/py { }; + + pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { inherit (pkgs) pkgconfig; }); + pycapnp = callPackage ../development/python-modules/pycapnp { }; pycaption = callPackage ../development/python-modules/pycaption { }; + pycarddav = callPackage ../development/python-modules/pycarddav { }; + + pycares = callPackage ../development/python-modules/pycares { }; + + pycassa = callPackage ../development/python-modules/pycassa { }; + + pycategories = callPackage ../development/python-modules/pycategories { }; + pycdio = callPackage ../development/python-modules/pycdio { }; + pychart = callPackage ../development/python-modules/pychart { }; + + pychef = callPackage ../development/python-modules/pychef { }; + + PyChromecast = callPackage ../development/python-modules/pychromecast { }; + + pyclipper = callPackage ../development/python-modules/pyclipper { }; + + pycm = callPackage ../development/python-modules/pycm { }; + + pycodestyle = callPackage ../development/python-modules/pycodestyle { }; + + pycognito = callPackage ../development/python-modules/pycognito { }; + + pycoin = callPackage ../development/python-modules/pycoin { }; + + pycollada = callPackage ../development/python-modules/pycollada { }; + + pycontracts = callPackage ../development/python-modules/pycontracts { }; + pycosat = callPackage ../development/python-modules/pycosat { }; + pycountry = callPackage ../development/python-modules/pycountry { }; + + pycparser = callPackage ../development/python-modules/pycparser { }; + + py-cpuinfo = callPackage ../development/python-modules/py-cpuinfo { }; + + pycrc = callPackage ../development/python-modules/pycrc { }; + + pycrypto = callPackage ../development/python-modules/pycrypto { }; + + pycryptodome = callPackage ../development/python-modules/pycryptodome { }; + + pycryptodomex = callPackage ../development/python-modules/pycryptodomex { }; + pycryptopp = callPackage ../development/python-modules/pycryptopp { }; pyct = callPackage ../development/python-modules/pyct { }; - pycups = callPackage ../development/python-modules/pycups { }; + pycuda = callPackage ../development/python-modules/pycuda { + cudatoolkit = pkgs.cudatoolkit; + inherit (pkgs.stdenv) mkDerivation; + }; - pycurl = callPackage ../development/python-modules/pycurl { }; + pycups = callPackage ../development/python-modules/pycups { }; pycurl2 = callPackage ../development/python-modules/pycurl2 { }; + pycurl = callPackage ../development/python-modules/pycurl { }; + + pydantic = callPackage ../development/python-modules/pydantic { }; + + pydbus = callPackage ../development/python-modules/pydbus { }; + + pydenticon = callPackage ../development/python-modules/pydenticon { }; + + pydicom = callPackage ../development/python-modules/pydicom { }; + pydispatcher = callPackage ../development/python-modules/pydispatcher { }; - pydot = callPackage ../development/python-modules/pydot { - inherit (pkgs) graphviz; - }; + pydns = let + py3 = callPackage ../development/python-modules/py3dns { }; + py2 = callPackage ../development/python-modules/pydns { }; + in if isPy3k then py3 else py2; + + pydocstyle = if isPy27 then + callPackage ../development/python-modules/pydocstyle/2.nix { } + else + callPackage ../development/python-modules/pydocstyle { }; + + pydocumentdb = callPackage ../development/python-modules/pydocumentdb { }; + + pydot = callPackage ../development/python-modules/pydot { inherit (pkgs) graphviz; }; pydot_ng = callPackage ../development/python-modules/pydot_ng { graphviz = pkgs.graphviz; }; + pydotplus = callPackage ../development/python-modules/pydotplus { }; + + pydrive = callPackage ../development/python-modules/pydrive { }; + + pydsdl = callPackage ../development/python-modules/pydsdl { }; + + pydub = callPackage ../development/python-modules/pydub { }; + + pydy = callPackage ../development/python-modules/pydy { }; + + pyechonest = callPackage ../development/python-modules/pyechonest { }; + pyelftools = callPackage ../development/python-modules/pyelftools { }; + pyemd = callPackage ../development/python-modules/pyemd { }; + pyenchant = callPackage ../development/python-modules/pyenchant { enchant2 = pkgs.enchant2; }; + pyepsg = callPackage ../development/python-modules/pyepsg { }; + + pyexcel = callPackage ../development/python-modules/pyexcel { }; + pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; + pyexcel-io = callPackage ../development/python-modules/pyexcel-io { }; + + pyexcel-ods = callPackage ../development/python-modules/pyexcel-ods { }; + + pyexcel-xls = callPackage ../development/python-modules/pyexcel-xls { }; + + pyexiv2 = disabledIf isPy3k (toPythonModule (callPackage ../development/python-modules/pyexiv2 { })); + pyext = callPackage ../development/python-modules/pyext { }; pyface = callPackage ../development/python-modules/pyface { }; + pyfaidx = callPackage ../development/python-modules/pyfaidx { }; + + pyfakefs = callPackage ../development/python-modules/pyfakefs { }; + pyfantom = callPackage ../development/python-modules/pyfantom { }; - pyfma = callPackage ../development/python-modules/pyfma { }; + pyfcm = callPackage ../development/python-modules/pyfcm { }; pyfftw = callPackage ../development/python-modules/pyfftw { }; @@ -5590,25 +4843,152 @@ in { pyflakes = callPackage ../development/python-modules/pyflakes { }; + pyfma = callPackage ../development/python-modules/pyfma { }; + + pyfribidi = callPackage ../development/python-modules/pyfribidi { }; + + pyfritzhome = callPackage ../development/python-modules/pyfritzhome { }; + + pyftdi = callPackage ../development/python-modules/pyftdi { }; + pyftgl = callPackage ../development/python-modules/pyftgl { }; - pygeoip = callPackage ../development/python-modules/pygeoip {}; + pyftpdlib = callPackage ../development/python-modules/pyftpdlib { }; - PyGithub = callPackage ../development/python-modules/pyGithub {}; + pyfttt = callPackage ../development/python-modules/pyfttt { }; - pyglet = callPackage ../development/python-modules/pyglet {}; + pyfxa = callPackage ../development/python-modules/pyfxa { }; + + pygal = callPackage ../development/python-modules/pygal { }; + + pygame = callPackage ../development/python-modules/pygame { }; + + pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; + + pygbm = callPackage ../development/python-modules/pygbm { }; + + pygccxml = callPackage ../development/python-modules/pygccxml { }; + + pygdbmi = callPackage ../development/python-modules/pygdbmi { }; + + pygeoip = callPackage ../development/python-modules/pygeoip { }; + + pygit2 = callPackage ../development/python-modules/pygit2 { }; + + PyGithub = callPackage ../development/python-modules/pyGithub { }; + + pyglet = callPackage ../development/python-modules/pyglet { }; + + pygls = callPackage ../development/python-modules/pygls { }; + + pygments-better-html = callPackage ../development/python-modules/pygments-better-html { }; pygments = if isPy3k then callPackage ../development/python-modules/Pygments { } else callPackage ../development/python-modules/Pygments/2_5.nix { }; + pygments-markdown-lexer = callPackage ../development/python-modules/pygments-markdown-lexer { }; + + pygmo = callPackage ../development/python-modules/pygmo { }; + + pygobject2 = callPackage ../development/python-modules/pygobject { inherit (pkgs) pkgconfig; }; + + pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; }; + + pygogo = callPackage ../development/python-modules/pygogo { }; + pygpgme = callPackage ../development/python-modules/pygpgme { }; - pyment = callPackage ../development/python-modules/pyment { }; + pygraphviz = callPackage ../development/python-modules/pygraphviz { + inherit (pkgs) graphviz pkgconfig; + }; # not the python package - pylint = if isPy3k then callPackage ../development/python-modules/pylint { } - else callPackage ../development/python-modules/pylint/1.9.nix { }; + pygreat = callPackage ../development/python-modules/pygreat { }; + + pygrok = callPackage ../development/python-modules/pygrok { }; + + pygtail = callPackage ../development/python-modules/pygtail { }; + + pygtk = callPackage ../development/python-modules/pygtk { + inherit (pkgs) pkgconfig; + libglade = null; + }; + + pyGtkGlade = self.pygtk.override { libglade = pkgs.gnome2.libglade; }; + + pygtksourceview = callPackage ../development/python-modules/pygtksourceview { inherit (pkgs) pkgconfig; }; + + pyhamcrest = if isPy3k then + callPackage ../development/python-modules/pyhamcrest { } + else + callPackage ../development/python-modules/pyhamcrest/1.nix { }; + + pyhaversion = callPackage ../development/python-modules/pyhaversion { }; + + pyhcl = callPackage ../development/python-modules/pyhcl { }; + + pyhocon = callPackage ../development/python-modules/pyhocon { }; + + pyhomematic = callPackage ../development/python-modules/pyhomematic { }; + + pyhs100 = callPackage ../development/python-modules/pyhs100 { }; + + pyicloud = callPackage ../development/python-modules/pyicloud { }; + + PyICU = callPackage ../development/python-modules/pyicu { }; + + pyinotify = callPackage ../development/python-modules/pyinotify { }; + + pyinputevent = callPackage ../development/python-modules/pyinputevent { }; + + pyipp = callPackage ../development/python-modules/pyipp { }; + + pyjade = callPackage ../development/python-modules/pyjade { }; + + pyjet = callPackage ../development/python-modules/pyjet { }; + + pyjks = callPackage ../development/python-modules/pyjks { }; + + pyjson5 = callPackage ../development/python-modules/pyjson5 { }; + + pyjwkest = callPackage ../development/python-modules/pyjwkest { }; + + pyjwt = callPackage ../development/python-modules/pyjwt { }; + + pykdtree = callPackage ../development/python-modules/pykdtree { inherit (pkgs.llvmPackages) openmp; }; + + pykeepass = callPackage ../development/python-modules/pykeepass { }; + + pykerberos = callPackage ../development/python-modules/pykerberos { }; + + pykickstart = callPackage ../development/python-modules/pykickstart { }; + + pykka = callPackage ../development/python-modules/pykka { }; + + pykwalify = callPackage ../development/python-modules/pykwalify { }; + + pylama = callPackage ../development/python-modules/pylama { }; + + pylast = callPackage ../development/python-modules/pylast { }; + + pylatexenc = callPackage ../development/python-modules/pylatexenc { }; + + PyLD = callPackage ../development/python-modules/PyLD { }; + + pylev = callPackage ../development/python-modules/pylev { }; + + pylibacl = callPackage ../development/python-modules/pylibacl { }; + + pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { }; + + pylibftdi = callPackage ../development/python-modules/pylibftdi { inherit (pkgs) libusb1; }; + + pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 + + pyliblo = callPackage ../development/python-modules/pyliblo { }; + + pylibmc = callPackage ../development/python-modules/pylibmc { }; pylint-celery = callPackage ../development/python-modules/pylint-celery { }; @@ -5616,237 +4996,838 @@ in { pylint-flask = callPackage ../development/python-modules/pylint-flask { }; + pylint = if isPy3k then + callPackage ../development/python-modules/pylint { } + else + callPackage ../development/python-modules/pylint/1.9.nix { }; + pylint-plugin-utils = callPackage ../development/python-modules/pylint-plugin-utils { }; - pymumble = callPackage ../development/python-modules/pymumble { }; + py-lru-cache = callPackage ../development/python-modules/py-lru-cache { }; - pyomo = callPackage ../development/python-modules/pyomo { }; + pylru = callPackage ../development/python-modules/pylru { }; - pyopencl = callPackage ../development/python-modules/pyopencl { }; + pyls-black = callPackage ../development/python-modules/pyls-black { }; - pyosmium = callPackage ../development/python-modules/pyosmium { }; + pyls-isort = callPackage ../development/python-modules/pyls-isort { }; - pyotp = callPackage ../development/python-modules/pyotp { }; + pyls-mypy = callPackage ../development/python-modules/pyls-mypy { }; - pyproj = callPackage ../development/python-modules/pyproj { }; + PyLTI = callPackage ../development/python-modules/pylti { }; - pyqrcode = callPackage ../development/python-modules/pyqrcode { }; - - pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { }; - - pyrad = callPackage ../development/python-modules/pyrad { }; - - pyrr = callPackage ../development/python-modules/pyrr { }; - - pysha3 = callPackage ../development/python-modules/pysha3 { }; - - pyshp = callPackage ../development/python-modules/pyshp { }; - - pysnow = callPackage ../development/python-modules/pysnow { }; - - pysmbc = callPackage ../development/python-modules/pysmbc { - inherit (pkgs) pkgconfig; - }; - - pyspread = callPackage ../development/python-modules/pyspread { }; - - pysparse = callPackage ../development/python-modules/pysparse { }; - - pyupdate = callPackage ../development/python-modules/pyupdate {}; - - pyvmomi = callPackage ../development/python-modules/pyvmomi { }; - - pyx = callPackage ../development/python-modules/pyx { }; - - mmpython = callPackage ../development/python-modules/mmpython { }; - - kaa-base = callPackage ../development/python-modules/kaa-base { }; - - kaa-metadata = callPackage ../development/python-modules/kaa-metadata { }; - - PyICU = callPackage ../development/python-modules/pyicu { }; - - pyinputevent = callPackage ../development/python-modules/pyinputevent { }; - - pyinotify = callPackage ../development/python-modules/pyinotify { }; - - pyipp = callPackage ../development/python-modules/pyipp { }; - - pyjwt = callPackage ../development/python-modules/pyjwt { }; - - pykickstart = callPackage ../development/python-modules/pykickstart { }; - - pymemoize = callPackage ../development/python-modules/pymemoize { }; - - pyobjc = if stdenv.isDarwin - then callPackage ../development/python-modules/pyobjc {} - else throw "pyobjc can only be built on Mac OS"; - - pyodbc = callPackage ../development/python-modules/pyodbc { }; - - pyocr = callPackage ../development/python-modules/pyocr { }; - - pyparsing = callPackage ../development/python-modules/pyparsing { }; - - pyparted = callPackage ../development/python-modules/pyparted { }; - - pyptlib = callPackage ../development/python-modules/pyptlib { }; - - pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; - - PyStemmer = callPackage ../development/python-modules/pystemmer {}; - - # Missing expression? - # Pyro = callPackage ../development/python-modules/pyro { }; - - pyrsistent = callPackage ../development/python-modules/pyrsistent { }; - - PyRSS2Gen = callPackage ../development/python-modules/pyrss2gen { }; - - pysmi = callPackage ../development/python-modules/pysmi { }; - - pysnmp = callPackage ../development/python-modules/pysnmp { }; - - pysocks = callPackage ../development/python-modules/pysocks { }; - - python_fedora = callPackage ../development/python-modules/python_fedora {}; - - python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat {}; - python_simple_hipchat = self.python-simple-hipchat; - - scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; }; - - python_keyczar = callPackage ../development/python-modules/python_keyczar { }; - - python-language-server = callPackage ../development/python-modules/python-language-server {}; - - python-jsonrpc-server = callPackage ../development/python-modules/python-jsonrpc-server {}; - - pyls-black = callPackage ../development/python-modules/pyls-black {}; - - pyls-isort = callPackage ../development/python-modules/pyls-isort {}; - - pyls-mypy = callPackage ../development/python-modules/pyls-mypy {}; - - pyu2f = callPackage ../development/python-modules/pyu2f { }; - - pyudev = callPackage ../development/python-modules/pyudev { - inherit (pkgs) systemd; - }; - - pynmea2 = callPackage ../development/python-modules/pynmea2 {}; - - pynrrd = callPackage ../development/python-modules/pynrrd { }; - - pynvml = callPackage ../development/python-modules/pynvml { }; - - pynzb = callPackage ../development/python-modules/pynzb { }; - - process-tests = callPackage ../development/python-modules/process-tests { }; - - progressbar = callPackage ../development/python-modules/progressbar {}; - - progressbar2 = callPackage ../development/python-modules/progressbar2 { }; - - progressbar231 = callPackage ../development/python-modules/progressbar231 { }; - - progressbar33 = callPackage ../development/python-modules/progressbar33 { }; - - protego = callPackage ../development/python-modules/protego {}; - - ldap = callPackage ../development/python-modules/ldap { - inherit (pkgs) openldap cyrus_sasl; - }; - - ldap3 = callPackage ../development/python-modules/ldap3 {}; - - ptest = callPackage ../development/python-modules/ptest { }; - - ptyprocess = callPackage ../development/python-modules/ptyprocess { }; - - pylibacl = callPackage ../development/python-modules/pylibacl { }; - - pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 - - pyliblo = callPackage ../development/python-modules/pyliblo { }; - - pypcap = callPackage ../development/python-modules/pypcap {}; - - pyplatec = callPackage ../development/python-modules/pyplatec { }; - - purepng = callPackage ../development/python-modules/purepng { }; - - pyhocon = callPackage ../development/python-modules/pyhocon { }; - - pyjson5 = callPackage ../development/python-modules/pyjson5 {}; + pymacaroons = callPackage ../development/python-modules/pymacaroons { }; pymaging = callPackage ../development/python-modules/pymaging { }; pymaging_png = callPackage ../development/python-modules/pymaging_png { }; - pyPdf = callPackage ../development/python-modules/pypdf { }; + pymatgen = callPackage ../development/python-modules/pymatgen { }; - pypdf2 = callPackage ../development/python-modules/pypdf2 { }; + pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { }; + + pymavlink = callPackage ../development/python-modules/pymavlink { }; + + pymbolic = callPackage ../development/python-modules/pymbolic { }; + + pymc3 = callPackage ../development/python-modules/pymc3 { }; + + pymediainfo = callPackage ../development/python-modules/pymediainfo { }; + + pymeeus = callPackage ../development/python-modules/pymeeus { }; + + pymemoize = callPackage ../development/python-modules/pymemoize { }; + + pyment = callPackage ../development/python-modules/pyment { }; + + pymetar = callPackage ../development/python-modules/pymetar { }; + + pymetno = callPackage ../development/python-modules/pymetno { }; + + pymongo = callPackage ../development/python-modules/pymongo { }; + + pympler = callPackage ../development/python-modules/pympler { }; + + pymsgbox = callPackage ../development/python-modules/pymsgbox { }; + + pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 + + py-multibase = callPackage ../development/python-modules/py-multibase { }; + + py-multihash = callPackage ../development/python-modules/py-multihash { }; + + pymumble = callPackage ../development/python-modules/pymumble { }; + + pymupdf = callPackage ../development/python-modules/pymupdf { }; + + PyMVGLive = callPackage ../development/python-modules/pymvglive { }; + + pymysql = callPackage ../development/python-modules/pymysql { }; + + pymysqlsa = callPackage ../development/python-modules/pymysqlsa { }; + + pymystem3 = callPackage ../development/python-modules/pymystem3 { }; + + pynac = callPackage ../development/python-modules/pynac { }; + + pynacl = callPackage ../development/python-modules/pynacl { }; + + pynamecheap = callPackage ../development/python-modules/pynamecheap { }; + + pynamodb = callPackage ../development/python-modules/pynamodb { }; + + pynanoleaf = callPackage ../development/python-modules/pynanoleaf { }; + + pync = callPackage ../development/python-modules/pync { }; + + pynisher = callPackage ../development/python-modules/pynisher { }; + + pynmea2 = callPackage ../development/python-modules/pynmea2 { }; + + pynput = callPackage ../development/python-modules/pynput { }; + + pynrrd = callPackage ../development/python-modules/pynrrd { }; + + pynvim = callPackage ../development/python-modules/pynvim { }; + + pynvml = callPackage ../development/python-modules/pynvml { }; + + pynzb = callPackage ../development/python-modules/pynzb { }; + + pyobjc = if stdenv.isDarwin then + callPackage ../development/python-modules/pyobjc { } + else + throw "pyobjc can only be built on Mac OS"; + + pyocr = callPackage ../development/python-modules/pyocr { }; + + pyodbc = callPackage ../development/python-modules/pyodbc { }; + + pyogg = callPackage ../development/python-modules/pyogg { }; + + pyomo = callPackage ../development/python-modules/pyomo { }; + + pyopencl = callPackage ../development/python-modules/pyopencl { }; pyopengl = callPackage ../development/python-modules/pyopengl { }; pyopenssl = callPackage ../development/python-modules/pyopenssl { }; - pyquery = callPackage ../development/python-modules/pyquery { }; + pyosmium = callPackage ../development/python-modules/pyosmium { }; - pyreport = callPackage ../development/python-modules/pyreport { }; + pyotp = callPackage ../development/python-modules/pyotp { }; - pyreadability = callPackage ../development/python-modules/pyreadability { }; + pyowm = callPackage ../development/python-modules/pyowm { }; - pyscss = callPackage ../development/python-modules/pyscss { }; + pypamtest = pkgs.libpam-wrapper.override { + enablePython = true; + inherit python; + }; - pyserial = callPackage ../development/python-modules/pyserial {}; + pypandoc = callPackage ../development/python-modules/pypandoc { }; - pyserial-asyncio = callPackage ../development/python-modules/pyserial-asyncio { }; + pyparser = callPackage ../development/python-modules/pyparser { }; - pysonos = callPackage ../development/python-modules/pysonos {}; + pyparsing = callPackage ../development/python-modules/pyparsing { }; - pymongo = callPackage ../development/python-modules/pymongo {}; + pyparted = callPackage ../development/python-modules/pyparted { }; + + pypcap = callPackage ../development/python-modules/pypcap { }; + + pypdf2 = callPackage ../development/python-modules/pypdf2 { }; + + pyPdf = callPackage ../development/python-modules/pypdf { }; + + pypeg2 = callPackage ../development/python-modules/pypeg2 { }; pyperclip = callPackage ../development/python-modules/pyperclip { }; + pyperf = callPackage ../development/python-modules/pyperf { }; + + pyphen = callPackage ../development/python-modules/pyphen { }; + + pyphotonfile = callPackage ../development/python-modules/pyphotonfile { }; + + pypillowfight = callPackage ../development/python-modules/pypillowfight { }; + + pyplatec = callPackage ../development/python-modules/pyplatec { }; + + pypoppler = callPackage ../development/python-modules/pypoppler { }; + + pyprind = callPackage ../development/python-modules/pyprind { }; + + pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { }; + + pyproj = callPackage ../development/python-modules/pyproj { }; + + pyptlib = callPackage ../development/python-modules/pyptlib { }; + + pypubsub = callPackage ../development/python-modules/pypubsub { }; + + pyqrcode = callPackage ../development/python-modules/pyqrcode { }; + + pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; }; + + pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; + + pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; + + /* + `pyqt5_with_qtwebkit` should not be used by python libraries in + pkgs/development/python-modules/*. Putting this attribute in + `propagatedBuildInputs` may cause collisions. + */ + pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; }; + + pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; + + pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; + + pyquery = callPackage ../development/python-modules/pyquery { }; + + pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { }; + + pyrad = callPackage ../development/python-modules/pyrad { }; + + py-radix = callPackage ../development/python-modules/py-radix { }; + + pyramid_beaker = callPackage ../development/python-modules/pyramid_beaker { }; + + pyramid = callPackage ../development/python-modules/pyramid { }; + + pyramid_chameleon = callPackage ../development/python-modules/pyramid_chameleon { }; + + pyramid_exclog = callPackage ../development/python-modules/pyramid_exclog { }; + + pyramid_hawkauth = callPackage ../development/python-modules/pyramid_hawkauth { }; + + pyramid_jinja2 = callPackage ../development/python-modules/pyramid_jinja2 { }; + + pyramid_mako = callPackage ../development/python-modules/pyramid_mako { }; + + pyramid_multiauth = callPackage ../development/python-modules/pyramid_multiauth { }; + + pyreadability = callPackage ../development/python-modules/pyreadability { }; + + pyrealsense2 = toPythonModule (pkgs.librealsense.override { + enablePython = true; + pythonPackages = self; + }); + + pyrealsense2WithCuda = toPythonModule (pkgs.librealsenseWithCuda.override { + enablePython = true; + pythonPackages = self; + }); + + pyrealsense2WithoutCuda = toPythonModule (pkgs.librealsenseWithoutCuda.override { + enablePython = true; + pythonPackages = self; + }); + + pyregion = callPackage ../development/python-modules/pyregion { }; + + pyreport = callPackage ../development/python-modules/pyreport { }; + + pyres = callPackage ../development/python-modules/pyres { }; + + pyRFC3339 = callPackage ../development/python-modules/pyrfc3339 { }; + + PyRMVtransport = callPackage ../development/python-modules/PyRMVtransport { }; + + Pyro4 = callPackage ../development/python-modules/pyro4 { }; + + Pyro5 = callPackage ../development/python-modules/pyro5 { }; + + pyroma = callPackage ../development/python-modules/pyroma { }; + + pyro-ppl = callPackage ../development/python-modules/pyro-ppl { }; + + pyroute2 = callPackage ../development/python-modules/pyroute2 { }; + + pyrr = callPackage ../development/python-modules/pyrr { }; + + pyrsistent = callPackage ../development/python-modules/pyrsistent { }; + + PyRSS2Gen = callPackage ../development/python-modules/pyrss2gen { }; + + pyrtlsdr = callPackage ../development/python-modules/pyrtlsdr { }; + + pysam = callPackage ../development/python-modules/pysam { }; + + pysaml2 = callPackage ../development/python-modules/pysaml2 { inherit (pkgs) xmlsec; }; + + pysc2 = callPackage ../development/python-modules/pysc2 { }; + + pyscard = callPackage ../development/python-modules/pyscard { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; }; + + pyschedule = callPackage ../development/python-modules/pyschedule { }; + + pyscreenshot = callPackage ../development/python-modules/pyscreenshot { }; + + py_scrypt = callPackage ../development/python-modules/py_scrypt { }; + + pyscrypt = callPackage ../development/python-modules/pyscrypt { }; + + pyscss = callPackage ../development/python-modules/pyscss { }; + + pysdl2 = callPackage ../development/python-modules/pysdl2 { }; + + pysendfile = callPackage ../development/python-modules/pysendfile { }; + + pysensors = callPackage ../development/python-modules/pysensors { }; + + pyserial-asyncio = callPackage ../development/python-modules/pyserial-asyncio { }; + + pyserial = callPackage ../development/python-modules/pyserial { }; + + pysftp = callPackage ../development/python-modules/pysftp { }; + + pysha3 = callPackage ../development/python-modules/pysha3 { }; + + pyshp = callPackage ../development/python-modules/pyshp { }; + + pyside2-tools = + toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake qt5; }); + + pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake qt5 ninja; }); + + pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; }; + + pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { inherit (pkgs) libxml2 libxslt; }; + + pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; + + pysigset = callPackage ../development/python-modules/pysigset { }; + + pysingleton = callPackage ../development/python-modules/pysingleton { }; + + pyslurm = callPackage ../development/python-modules/pyslurm { slurm = pkgs.slurm; }; + + pysmb = callPackage ../development/python-modules/pysmb { }; + + pysmbc = callPackage ../development/python-modules/pysmbc { inherit (pkgs) pkgconfig; }; + + pysmf = callPackage ../development/python-modules/pysmf { }; + + pysmi = callPackage ../development/python-modules/pysmi { }; + + pysnmp = callPackage ../development/python-modules/pysnmp { }; + + pysnooper = callPackage ../development/python-modules/pysnooper { }; + + pysnow = callPackage ../development/python-modules/pysnow { }; + + pysocks = callPackage ../development/python-modules/pysocks { }; + + pysolr = callPackage ../development/python-modules/pysolr { }; + + pysonos = callPackage ../development/python-modules/pysonos { }; + + pysoundfile = self.soundfile; # Alias added 23-06-2019 + + pyspark = callPackage ../development/python-modules/pyspark { }; + + pysparse = callPackage ../development/python-modules/pysparse { }; + + pyspf = callPackage ../development/python-modules/pyspf { }; + + pyspinel = callPackage ../development/python-modules/pyspinel { }; + + pyspotify = callPackage ../development/python-modules/pyspotify { }; + + pyspread = callPackage ../development/python-modules/pyspread { }; + + pysptk = callPackage ../development/python-modules/pysptk { }; + pysqlite = callPackage ../development/python-modules/pysqlite { }; + pysrim = callPackage ../development/python-modules/pysrim { }; + + pysrt = callPackage ../development/python-modules/pysrt { }; + + pyssim = callPackage ../development/python-modules/pyssim { }; + + pystache = callPackage ../development/python-modules/pystache { }; + + pystemd = callPackage ../development/python-modules/pystemd { systemd = pkgs.systemd; }; + + PyStemmer = callPackage ../development/python-modules/pystemmer { }; + + pystray = callPackage ../development/python-modules/pystray { }; + + py_stringmatching = callPackage ../development/python-modules/py_stringmatching { }; + + pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; + pysvn = callPackage ../development/python-modules/pysvn { }; + pytado = callPackage ../development/python-modules/pytado { }; + + pytaglib = callPackage ../development/python-modules/pytaglib { }; + + pyte = callPackage ../development/python-modules/pyte { }; + + pytelegrambotapi = callPackage ../development/python-modules/pyTelegramBotAPI { }; + + pytesseract = callPackage ../development/python-modules/pytesseract { }; + + # pytest>=6 is too new for most packages + pytest = if isPy3k then self.pytest_5 else self.pytest_4; + + pytest_4 = callPackage + ../development/python-modules/pytest/4.nix { # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; + }; + + pytest_5 = callPackage + ../development/python-modules/pytest/5.nix { # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; + }; + + pytest_6 = + callPackage ../development/python-modules/pytest { # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; + }; + + pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; + + pytest-annotate = callPackage ../development/python-modules/pytest-annotate { }; + + pytest-ansible = callPackage ../development/python-modules/pytest-ansible { }; + + pytest-arraydiff = callPackage ../development/python-modules/pytest-arraydiff { }; + + pytest-astropy = callPackage ../development/python-modules/pytest-astropy { }; + + pytest-astropy-header = callPackage ../development/python-modules/pytest-astropy-header { }; + + pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { }; + + pytest-bdd = callPackage ../development/python-modules/pytest-bdd { }; + + pytest-benchmark = callPackage ../development/python-modules/pytest-benchmark { }; + + pytest-black = callPackage ../development/python-modules/pytest-black { }; + + pytestcache = callPackage ../development/python-modules/pytestcache { }; + + pytest-catchlog = callPackage ../development/python-modules/pytest-catchlog { }; + + pytest-check = callPackage ../development/python-modules/pytest-check { }; + + pytest-click = callPackage ../development/python-modules/pytest-click { }; + + pytestcov = callPackage ../development/python-modules/pytest-cov { }; + + pytest-cram = callPackage ../development/python-modules/pytest-cram { }; + + pytest-datadir = callPackage ../development/python-modules/pytest-datadir { }; + + pytest-datafiles = callPackage ../development/python-modules/pytest-datafiles { }; + + pytest-dependency = callPackage ../development/python-modules/pytest-dependency { }; + + pytest-django = callPackage ../development/python-modules/pytest-django { }; + + pytest-doctestplus = callPackage ../development/python-modules/pytest-doctestplus { }; + + pytest-env = callPackage ../development/python-modules/pytest-env { }; + + pytest-expect = callPackage ../development/python-modules/pytest-expect { }; + + pytest-factoryboy = callPackage ../development/python-modules/pytest-factoryboy { }; + + pytest-filter-subpackage = callPackage ../development/python-modules/pytest-filter-subpackage { }; + + pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { }; + + pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { }; + + pytest-flakes = callPackage ../development/python-modules/pytest-flakes { }; + + pytest-flask = callPackage ../development/python-modules/pytest-flask { }; + + pytest-forked = callPackage ../development/python-modules/pytest-forked { }; + + pytest-freezegun = callPackage ../development/python-modules/pytest-freezegun { }; + + pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { }; + + pytest-html = callPackage ../development/python-modules/pytest-html { }; + + pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; + + pytest-isort = callPackage ../development/python-modules/pytest-isort { }; + + pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { }; + + pytest-localserver = callPackage ../development/python-modules/pytest-localserver { }; + + pytest-metadata = callPackage ../development/python-modules/pytest-metadata { }; + + pytest-mock = if isPy3k then + callPackage ../development/python-modules/pytest-mock { } + else + callPackage ../development/python-modules/pytest-mock/2.nix { }; + + pytest-mpl = callPackage ../development/python-modules/pytest-mpl { }; + + pytest-mypy = callPackage ../development/python-modules/pytest-mypy { }; + + pytest-openfiles = callPackage ../development/python-modules/pytest-openfiles { }; + + pytest-ordering = callPackage ../development/python-modules/pytest-ordering { }; + + pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; + + pytestpep8 = callPackage ../development/python-modules/pytest-pep8 { }; + + pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; + + pytest-pythonpath = callPackage ../development/python-modules/pytest-pythonpath { }; + + pytest-qt = callPackage ../development/python-modules/pytest-qt { }; + + pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; + + pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { }; + + pytest-randomly = callPackage ../development/python-modules/pytest-randomly { }; + + pytest-random-order = callPackage ../development/python-modules/pytest-random-order { }; + + pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { }; + + pytest-remotedata = callPackage ../development/python-modules/pytest-remotedata { }; + + pytest-repeat = callPackage ../development/python-modules/pytest-repeat { }; + + pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; + + pytestrunner = callPackage ../development/python-modules/pytestrunner { }; + + pytest-sanic = callPackage ../development/python-modules/pytest-sanic { }; + + pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { }; + + pytest-services = callPackage ../development/python-modules/pytest-services { }; + + pytest-shutil = callPackage ../development/python-modules/pytest-shutil { }; + + pytest-socket = callPackage ../development/python-modules/pytest-socket { }; + + pytest-subtesthack = callPackage ../development/python-modules/pytest-subtesthack { }; + + pytest-sugar = callPackage ../development/python-modules/pytest-sugar { }; + + pytest-testmon = callPackage ../development/python-modules/pytest-testmon { }; + + pytest-timeout = callPackage ../development/python-modules/pytest-timeout { }; + + pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; + + pytest-tornasync = callPackage ../development/python-modules/pytest-tornasync { }; + + pytest-trio = callPackage ../development/python-modules/pytest-trio { }; + + pytest-twisted = callPackage ../development/python-modules/pytest-twisted { }; + + pytest-virtualenv = callPackage ../development/python-modules/pytest-virtualenv { }; + + pytest-warnings = callPackage ../development/python-modules/pytest-warnings { }; + + pytest-watch = callPackage ../development/python-modules/pytest-watch { }; + + pytest_xdist_1 = callPackage ../development/python-modules/pytest-xdist { }; + + pytest_xdist_2 = callPackage ../development/python-modules/pytest-xdist/2.nix { }; + + pytest_xdist = self.pytest_xdist_1; + + pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; + + pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { }; + + python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { }; + + python3-openid = callPackage ../development/python-modules/python3-openid { }; + + python-axolotl = callPackage ../development/python-modules/python-axolotl { }; + + python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { }; + + python-baseconv = callPackage ../development/python-modules/python-baseconv { }; + + python-binance = callPackage ../development/python-modules/python-binance { }; + + python-constraint = callPackage ../development/python-modules/python-constraint { }; + + python-ctags3 = callPackage ../development/python-modules/python-ctags3 { }; + + python-daemon = callPackage ../development/python-modules/python-daemon { }; + + python-dateutil = callPackage ../development/python-modules/dateutil { }; + # Alias that we should deprecate + dateutil = self.python-dateutil; + + python-dbusmock = callPackage ../development/python-modules/python-dbusmock { }; + + pythondialog = callPackage ../development/python-modules/pythondialog { }; + + python-didl-lite = callPackage ../development/python-modules/python-didl-lite { }; + + python-docx = callPackage ../development/python-modules/python-docx { }; + + python-doi = callPackage ../development/python-modules/python-doi { }; + + python-dotenv = callPackage ../development/python-modules/python-dotenv { }; + + python-editor = callPackage ../development/python-modules/python-editor { }; + + pythonefl = callPackage ../development/python-modules/python-efl { inherit (pkgs) pkgconfig; }; + + python-engineio = callPackage ../development/python-modules/python-engineio { }; + + python-etcd = callPackage ../development/python-modules/python-etcd { }; + + python_fedora = callPackage ../development/python-modules/python_fedora { }; + + python-fontconfig = callPackage ../development/python-modules/python-fontconfig { }; + + python-forecastio = callPackage ../development/python-modules/python-forecastio { }; + + python-gitlab = callPackage ../development/python-modules/python-gitlab { }; + + python-gnupg = callPackage ../development/python-modules/python-gnupg { }; + + python-hosts = callPackage ../development/python-modules/python-hosts { }; + + python-igraph = callPackage ../development/python-modules/python-igraph { + pkgconfig = pkgs.pkgconfig; + igraph = pkgs.igraph; + }; + + pythonIRClib = callPackage ../development/python-modules/pythonirclib { }; + + pythonix = callPackage ../development/python-modules/pythonix { inherit (pkgs) meson pkgconfig; }; + + python-jenkins = callPackage ../development/python-modules/python-jenkins { }; + + python-jose = callPackage ../development/python-modules/python-jose { }; + + python-json-logger = callPackage ../development/python-modules/python-json-logger { }; + + python-jsonrpc-server = callPackage ../development/python-modules/python-jsonrpc-server { }; + + python_keyczar = callPackage ../development/python-modules/python_keyczar { }; + + python-language-server = callPackage ../development/python-modules/python-language-server { }; + + python-ldap-test = callPackage ../development/python-modules/python-ldap-test { }; + + python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { }; + + python-libarchive = callPackage ../development/python-modules/python-libarchive { }; + + python-logstash = callPackage ../development/python-modules/python-logstash { }; + + python-ly = callPackage ../development/python-modules/python-ly { }; + + python-lz4 = callPackage ../development/python-modules/python-lz4 { }; + + python-lzf = callPackage ../development/python-modules/python-lzf { }; + + python-lzo = callPackage ../development/python-modules/python-lzo { inherit (pkgs) lzo; }; + + python_magic = callPackage ../development/python-modules/python-magic { }; + + pythonmagick = callPackage ../development/python-modules/pythonmagick { }; + + python-mapnik = callPackage ../development/python-modules/python-mapnik { }; + python-markdown-math = callPackage ../development/python-modules/python-markdown-math { }; python-miio = callPackage ../development/python-modules/python-miio { }; + python_mimeparse = callPackage ../development/python-modules/python_mimeparse { }; + + python-mnist = callPackage ../development/python-modules/python-mnist { }; + + python-mpv-jsonipc = callPackage ../development/python-modules/python-mpv-jsonipc { }; + + python-multipart = callPackage ../development/python-modules/python-multipart { }; + + pythonnet = callPackage + ../development/python-modules/pythonnet { # `mono >= 4.6` required to prevent crashes encountered with earlier versions. + mono = pkgs.mono4; + inherit (pkgs) pkgconfig; + }; + + python-nomad = callPackage ../development/python-modules/python-nomad { }; + + python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; + + pythonocc-core = + toPythonModule (callPackage ../development/python-modules/pythonocc-core { inherit (pkgs.xorg) libX11; }); + + python-olm = callPackage ../development/python-modules/python-olm { }; + + python_openzwave = callPackage ../development/python-modules/python_openzwave { inherit (pkgs) pkgconfig; }; + + python-otr = callPackage ../development/python-modules/python-otr { }; + + python-packer = callPackage ../development/python-modules/python-packer { }; + + python-pam = callPackage ../development/python-modules/python-pam { }; + + python-periphery = callPackage ../development/python-modules/python-periphery { }; + python-pipedrive = callPackage ../development/python-modules/python-pipedrive { }; + python-prctl = callPackage ../development/python-modules/python-prctl { }; + python-ptrace = callPackage ../development/python-modules/python-ptrace { }; + python-pushover = callPackage ../development/python-modules/pushover { }; + + python-rapidjson = callPackage ../development/python-modules/python-rapidjson { }; + + python-redis-lock = callPackage ../development/python-modules/python-redis-lock { }; + + python-rtmidi = callPackage ../development/python-modules/python-rtmidi { }; + + python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat { }; + python_simple_hipchat = self.python-simple-hipchat; + + python-slugify = callPackage ../development/python-modules/python-slugify { }; + + python-snappy = callPackage ../development/python-modules/python-snappy { inherit (pkgs) snappy; }; + + python-socketio = callPackage ../development/python-modules/python-socketio { }; + + python-sql = callPackage ../development/python-modules/python-sql { }; + + python_statsd = callPackage ../development/python-modules/python_statsd { }; + + python-stdnum = callPackage ../development/python-modules/python-stdnum { }; + + python-sybase = callPackage ../development/python-modules/sybase { }; + + python-telegram-bot = callPackage ../development/python-modules/python-telegram-bot { }; + + python-toolbox = callPackage ../development/python-modules/python-toolbox { }; + + python-twitter = callPackage ../development/python-modules/python-twitter { }; + + python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { }; + + python-uinput = callPackage ../development/python-modules/python-uinput { }; + + python-unshare = callPackage ../development/python-modules/python-unshare { }; + + python-utils = callPackage ../development/python-modules/python-utils { }; + + python-vagrant = callPackage ../development/python-modules/python-vagrant { }; + + python-vipaccess = callPackage ../development/python-modules/python-vipaccess { }; + + python-vlc = callPackage ../development/python-modules/python-vlc { }; + python-wifi = callPackage ../development/python-modules/python-wifi { }; - python-etcd = callPackage ../development/python-modules/python-etcd { }; + python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; - pythonnet = callPackage ../development/python-modules/pythonnet { - # `mono >= 4.6` required to prevent crashes encountered with earlier versions. - mono = pkgs.mono4; - inherit (pkgs) pkgconfig; + pytimeparse = callPackage ../development/python-modules/pytimeparse { }; + + pytmx = callPackage ../development/python-modules/pytmx { }; + + pytoml = callPackage ../development/python-modules/pytoml { }; + + pytools = callPackage ../development/python-modules/pytools { }; + + pytorch = callPackage ../development/python-modules/pytorch { cudaSupport = pkgs.config.cudaSupport or false; }; + + pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { + inherit (pkgs.linuxPackages) nvidia_x11; }; + pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { }; + + pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { }; + + pytorchWithCuda = self.pytorch.override { cudaSupport = true; }; + + pytorchWithoutCuda = self.pytorch.override { cudaSupport = false; }; + + pytrends = callPackage ../development/python-modules/pytrends { }; + + pytricia = callPackage ../development/python-modules/pytricia { }; + + pytun = callPackage ../development/python-modules/pytun { }; + pytz = callPackage ../development/python-modules/pytz { }; pytzdata = callPackage ../development/python-modules/pytzdata { }; + pyu2f = callPackage ../development/python-modules/pyu2f { }; + + pyuavcan = callPackage + ../development/python-modules/pyuavcan { # this version pinpoint to anold version is necessary due to a regression + nunavut = self.nunavut.overridePythonAttrs (old: rec { + version = "0.2.3"; + src = old.src.override { + inherit version; + sha256 = "0x8a9h4mc2r2yz49s9arsbs4bn3h25mvmg4zbgksm9hcyi9536x5"; + }; + }); + }; + + pyudev = callPackage ../development/python-modules/pyudev { inherit (pkgs) systemd; }; + + pyunbound = callPackage ../tools/networking/unbound/python.nix { }; + + pyunifi = callPackage ../development/python-modules/pyunifi { }; + + pyupdate = callPackage ../development/python-modules/pyupdate { }; + + pyusb = callPackage ../development/python-modules/pyusb { libusb1 = pkgs.libusb1; }; + pyutil = callPackage ../development/python-modules/pyutil { }; pyutilib = callPackage ../development/python-modules/pyutilib { }; + pyuv = callPackage ../development/python-modules/pyuv { }; + + py-vapid = callPackage ../development/python-modules/py-vapid { }; + + pyvcd = callPackage ../development/python-modules/pyvcd { }; + + pyvcf = callPackage ../development/python-modules/pyvcf { }; + + pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; + + pyvmomi = callPackage ../development/python-modules/pyvmomi { }; + + pyvoro = callPackage ../development/python-modules/pyvoro { }; + pywal = callPackage ../development/python-modules/pywal { }; + pywatchman = callPackage ../development/python-modules/pywatchman { }; + + pywavelets = callPackage ../development/python-modules/pywavelets { }; + + PyWebDAV = callPackage ../development/python-modules/pywebdav { }; + + pywebpush = callPackage ../development/python-modules/pywebpush { }; + + pywebview = callPackage ../development/python-modules/pywebview { }; + + pywick = callPackage ../development/python-modules/pywick { }; + pywinrm = callPackage ../development/python-modules/pywinrm { }; pyxattr = let pyxattr' = callPackage ../development/python-modules/pyxattr { }; - pyxattr_2 = pyxattr'.overridePythonAttrs(oldAttrs: rec { + pyxattr_2 = pyxattr'.overridePythonAttrs (oldAttrs: rec { version = "0.6.1"; src = oldAttrs.src.override { inherit version; @@ -5855,48 +5836,21 @@ in { }); in if isPy3k then pyxattr' else pyxattr_2; - pyamg = callPackage ../development/python-modules/pyamg { }; + pyx = callPackage ../development/python-modules/pyx { }; - pyaml = callPackage ../development/python-modules/pyaml { }; + pyxdg = callPackage ../development/python-modules/pyxdg { }; + + pyxl3 = callPackage ../development/python-modules/pyxl3 { }; + + pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml { }); pyyaml = callPackage ../development/python-modules/pyyaml { }; - rabbitpy = callPackage ../development/python-modules/rabbitpy { }; + pyzmq = callPackage ../development/python-modules/pyzmq { }; - rasterio = callPackage ../development/python-modules/rasterio { - gdal = pkgs.gdal_2; # gdal 3.0 not supported yet - }; + pyzufall = callPackage ../development/python-modules/pyzufall { }; - radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud {}; - - recaptcha_client = callPackage ../development/python-modules/recaptcha_client { }; - - rbtools = callPackage ../development/python-modules/rbtools { }; - - rencode = callPackage ../development/python-modules/rencode { }; - - reportlab = callPackage ../development/python-modules/reportlab { }; - - requests = callPackage ../development/python-modules/requests { }; - - requests_download = callPackage ../development/python-modules/requests_download { }; - - requestsexceptions = callPackage ../development/python-modules/requestsexceptions {}; - - requests_ntlm = callPackage ../development/python-modules/requests_ntlm { }; - - requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib { }; - - requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { }; - requests_toolbelt = self.requests-toolbelt; # Old attr, 2017-09-26 - - retry_decorator = callPackage ../development/python-modules/retry_decorator { }; - - roboschool = callPackage ../development/python-modules/roboschool { - inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package - }; - - rfc6555 = callPackage ../development/python-modules/rfc6555 { }; + qasm2image = callPackage ../development/python-modules/qasm2image { }; qdarkstyle = callPackage ../development/python-modules/qdarkstyle { }; @@ -5904,19 +5858,27 @@ in { qimage2ndarray = callPackage ../development/python-modules/qimage2ndarray { }; - quamash = callPackage ../development/python-modules/quamash { }; + qiskit-aer = callPackage ../development/python-modules/qiskit-aer { }; - quandl = callPackage ../development/python-modules/quandl { }; - # alias for an older package which did not support Python 3 - Quandl = callPackage ../development/python-modules/quandl { }; + qiskit-aqua = callPackage ../development/python-modules/qiskit-aqua { }; - querystring_parser = callPackage ../development/python-modules/querystring-parser { }; + qiskit = callPackage ../development/python-modules/qiskit { }; + + qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { }; + + qiskit-ignis = callPackage ../development/python-modules/qiskit-ignis { }; + + qiskit-terra = callPackage ../development/python-modules/qiskit-terra { }; + + qpid-python = callPackage ../development/python-modules/qpid-python { }; + + qrcode = callPackage ../development/python-modules/qrcode { }; + + qreactor = callPackage ../development/python-modules/qreactor { }; qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { }; - qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { - pythonPackages = self; - }; + qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; }; qscintilla = self.qscintilla-qt4; @@ -5928,81 +5890,181 @@ in { qtpy = callPackage ../development/python-modules/qtpy { }; - qreactor = callPackage ../development/python-modules/qreactor { }; + quamash = callPackage ../development/python-modules/quamash { }; + + quandl = callPackage ../development/python-modules/quandl { }; + + Quandl = + callPackage ../development/python-modules/quandl { }; # alias for an older package which did not support Python 3 quantities = callPackage ../development/python-modules/quantities { }; + querystring_parser = callPackage ../development/python-modules/querystring-parser { }; + + queuelib = callPackage ../development/python-modules/queuelib { }; + qutip = callPackage ../development/python-modules/qutip { }; + r2pipe = callPackage ../development/python-modules/r2pipe { }; + + rabbitpy = callPackage ../development/python-modules/rabbitpy { }; + + radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud { }; + + radio_beam = callPackage ../development/python-modules/radio_beam { }; + + radish-bdd = callPackage ../development/python-modules/radish-bdd { }; + + rainbowstream = callPackage ../development/python-modules/rainbowstream { }; + + ramlfications = callPackage ../development/python-modules/ramlfications { }; + + random2 = callPackage ../development/python-modules/random2 { }; + + rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; }; + + rasterio = callPackage ../development/python-modules/rasterio { gdal = pkgs.gdal_2; }; # gdal 3.0 not supported yet + + ratelimiter = callPackage ../development/python-modules/ratelimiter { }; + + raven = callPackage ../development/python-modules/raven { }; + + rawkit = callPackage ../development/python-modules/rawkit { }; + + rbtools = callPackage ../development/python-modules/rbtools { }; + rcssmin = callPackage ../development/python-modules/rcssmin { }; + rdflib = callPackage ../development/python-modules/rdflib { }; + + rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { }; + + readchar = callPackage ../development/python-modules/readchar { }; + + readme = callPackage ../development/python-modules/readme { }; + + readme_renderer = callPackage ../development/python-modules/readme_renderer { }; + + readthedocs-sphinx-ext = callPackage ../development/python-modules/readthedocs-sphinx-ext { }; + + rebulk = callPackage ../development/python-modules/rebulk { }; + + recaptcha_client = callPackage ../development/python-modules/recaptcha_client { }; + recommonmark = callPackage ../development/python-modules/recommonmark { }; redis = callPackage ../development/python-modules/redis { }; rednose = callPackage ../development/python-modules/rednose { }; + regex = callPackage ../development/python-modules/regex { }; + + regional = callPackage ../development/python-modules/regional { }; + reikna = callPackage ../development/python-modules/reikna { }; + relatorio = callPackage ../development/python-modules/relatorio { }; + + remotecv = callPackage ../development/python-modules/remotecv { }; + + rencode = callPackage ../development/python-modules/rencode { }; + + repeated_test = callPackage ../development/python-modules/repeated_test { }; + repocheck = callPackage ../development/python-modules/repocheck { }; - restrictedpython = callPackage ../development/python-modules/restrictedpython { }; + reportlab = callPackage ../development/python-modules/reportlab { }; - restview = callPackage ../development/python-modules/restview { }; + repoze_lru = callPackage ../development/python-modules/repoze_lru { }; - readme = callPackage ../development/python-modules/readme { }; + repoze_sphinx_autointerface = callPackage ../development/python-modules/repoze_sphinx_autointerface { }; - readme_renderer = callPackage ../development/python-modules/readme_renderer { }; + repoze_who = callPackage ../development/python-modules/repoze_who { }; - readchar = callPackage ../development/python-modules/readchar { }; + reproject = callPackage ../development/python-modules/reproject { }; - retworkx = disabledIf (pythonOlder "3.5") - (toPythonModule (callPackage ../development/python-modules/retworkx { } )); + requests-aws4auth = callPackage ../development/python-modules/requests-aws4auth { }; - rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override { - python3 = python; - })); + requests-cache = callPackage ../development/python-modules/requests-cache { }; - ripser = callPackage ../development/python-modules/ripser { }; + requests = callPackage ../development/python-modules/requests { }; - rjsmin = callPackage ../development/python-modules/rjsmin { }; + requests_download = callPackage ../development/python-modules/requests_download { }; - pysolr = callPackage ../development/python-modules/pysolr { }; + requestsexceptions = callPackage ../development/python-modules/requestsexceptions { }; - geoalchemy2 = callPackage ../development/python-modules/geoalchemy2 { }; - - geographiclib = callPackage ../development/python-modules/geographiclib { }; - - geopy = if isPy3k - then callPackage ../development/python-modules/geopy { } - else callPackage ../development/python-modules/geopy/2.nix { }; - - django-haystack = callPackage ../development/python-modules/django-haystack { }; - - django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { }; - - rdflib = callPackage ../development/python-modules/rdflib { }; - - rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { }; - - isodate = callPackage ../development/python-modules/isodate { }; - - owslib = callPackage ../development/python-modules/owslib { }; - - readthedocs-sphinx-ext = callPackage ../development/python-modules/readthedocs-sphinx-ext { }; + requests-file = callPackage ../development/python-modules/requests-file { }; requests-http-signature = callPackage ../development/python-modules/requests-http-signature { }; + requests-kerberos = callPackage ../development/python-modules/requests-kerberos { }; + + requests-mock = callPackage ../development/python-modules/requests-mock { }; + + requests_ntlm = callPackage ../development/python-modules/requests_ntlm { }; + + requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib { }; + + requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { }; + + requests_toolbelt = self.requests-toolbelt; # Old attr, 2017-09-26 + + requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket { }; + requirements-detector = callPackage ../development/python-modules/requirements-detector { }; resampy = callPackage ../development/python-modules/resampy { }; + responses = callPackage ../development/python-modules/responses { }; + + restrictedpython = callPackage ../development/python-modules/restrictedpython { }; + restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { }; + restview = callPackage ../development/python-modules/restview { }; + + rethinkdb = callPackage ../development/python-modules/rethinkdb { }; + retry = callPackage ../development/python-modules/retry { }; + retry_decorator = callPackage ../development/python-modules/retry_decorator { }; + + retrying = callPackage ../development/python-modules/retrying { }; + + retworkx = disabledIf (pythonOlder "3.5") (toPythonModule (callPackage ../development/python-modules/retworkx { })); + + rfc3986 = callPackage ../development/python-modules/rfc3986 { }; + + rfc3987 = callPackage ../development/python-modules/rfc3987 { }; + + rfc6555 = callPackage ../development/python-modules/rfc6555 { }; + + rfc7464 = callPackage ../development/python-modules/rfc7464 { }; + + rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl { }); + + rig = callPackage ../development/python-modules/rig { }; + + ripser = callPackage ../development/python-modules/ripser { }; + + rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override { python3 = python; })); + + rjsmin = callPackage ../development/python-modules/rjsmin { }; + + rl-coach = callPackage ../development/python-modules/rl-coach { }; + + rlp = callPackage ../development/python-modules/rlp { }; + + rnc2rng = callPackage ../development/python-modules/rnc2rng { }; + robomachine = callPackage ../development/python-modules/robomachine { }; + roboschool = callPackage ../development/python-modules/roboschool { + inherit (pkgs) pkgconfig; + }; # use normal pkgconfig, not the python package + + robot-detection = callPackage ../development/python-modules/robot-detection { }; + robotframework = callPackage ../development/python-modules/robotframework { }; robotframework-databaselibrary = callPackage ../development/python-modules/robotframework-databaselibrary { }; @@ -6011,10 +6073,10 @@ in { robotframework-ride = callPackage ../development/python-modules/robotframework-ride { }; - robotframework-seleniumlibrary = callPackage ../development/python-modules/robotframework-seleniumlibrary { }; - robotframework-selenium2library = callPackage ../development/python-modules/robotframework-selenium2library { }; + robotframework-seleniumlibrary = callPackage ../development/python-modules/robotframework-seleniumlibrary { }; + robotframework-sshlibrary = callPackage ../development/python-modules/robotframework-sshlibrary { }; robotframework-tools = callPackage ../development/python-modules/robotframework-tools { }; @@ -6023,512 +6085,51 @@ in { robotsuite = callPackage ../development/python-modules/robotsuite { }; - serpent = callPackage ../development/python-modules/serpent { }; + rocket-errbot = callPackage ../development/python-modules/rocket-errbot { }; - selectors34 = callPackage ../development/python-modules/selectors34 { }; + roku = callPackage ../development/python-modules/roku { }; - Pyro4 = callPackage ../development/python-modules/pyro4 { }; - - Pyro5 = callPackage ../development/python-modules/pyro5 { }; - - rnc2rng = callPackage ../development/python-modules/rnc2rng { }; + roman = callPackage ../development/python-modules/roman { }; rope = callPackage ../development/python-modules/rope { }; + ROPGadget = callPackage ../development/python-modules/ROPGadget { }; + ropper = callPackage ../development/python-modules/ropper { }; - rpkg = callPackage ../development/python-modules/rpkg {}; - - rply = callPackage ../development/python-modules/rply {}; - - rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override{ inherit python; })); - - rpmfluff = callPackage ../development/python-modules/rpmfluff {}; - - rpy2 = if isPy3k - then callPackage ../development/python-modules/rpy2 { } - else callPackage ../development/python-modules/rpy2/2.nix { }; - - rtslib = callPackage ../development/python-modules/rtslib {}; - - Rtree = callPackage ../development/python-modules/Rtree { inherit (pkgs) libspatialindex; }; - - typing = callPackage ../development/python-modules/typing { }; - - typing-extensions = callPackage ../development/python-modules/typing-extensions { }; - - typing-inspect = callPackage ../development/python-modules/typing-inspect { }; - - typeguard = callPackage ../development/python-modules/typeguard { }; - - typesentry = callPackage ../development/python-modules/typesentry { }; - - typesystem = callPackage ../development/python-modules/typesystem { }; - - s3transfer = callPackage ../development/python-modules/s3transfer { }; - - seqdiag = callPackage ../development/python-modules/seqdiag { }; - - sequoia = disabledIf (isPyPy || !isPy3k) (toPythonModule (pkgs.sequoia.override { - pythonPackages = self; - pythonSupport = true; - })); - - safe = callPackage ../development/python-modules/safe { }; - - safety = callPackage ../development/python-modules/safety { }; - - sampledata = callPackage ../development/python-modules/sampledata { }; - - sasmodels = callPackage ../development/python-modules/sasmodels { }; - - scapy = callPackage ../development/python-modules/scapy { }; - - scipy = let - scipy_ = callPackage ../development/python-modules/scipy { }; - scipy_1_2 = scipy_.overridePythonAttrs(oldAttrs: rec { - version = "1.2.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1"; - }; - }); - in if pythonOlder "3.5" then scipy_1_2 else scipy_; - - scipy_1_3 = self.scipy.overridePythonAttrs(oldAttrs: rec { - version = "1.3.3"; - src = oldAttrs.src.override { - inherit version; - sha256 = "02iqb7ws7fw5fd1a83hx705pzrw1imj7z0bphjsl4bfvw254xgv4"; - }; - doCheck = false; - disabled = !isPy3k; - }); - - scikitimage = callPackage ../development/python-modules/scikit-image { }; - - scikitlearn = let - args = { inherit (pkgs) gfortran glibcLocales; }; - in - if isPy3k then callPackage ../development/python-modules/scikitlearn args - else callPackage ../development/python-modules/scikitlearn/0.20.nix args; - - scikit-bio = callPackage ../development/python-modules/scikit-bio { }; - - scikit-build = callPackage ../development/python-modules/scikit-build { }; - - scikits-odes = callPackage ../development/python-modules/scikits-odes { }; - - scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; - - scikit-tda = callPackage ../development/python-modules/scikit-tda { }; - - scikit-fmm = callPackage ../development/python-modules/scikit-fmm { }; - - scp = callPackage ../development/python-modules/scp {}; - - seaborn = if isPy3k then - callPackage ../development/python-modules/seaborn { } - else - callPackage ../development/python-modules/seaborn/0.9.1.nix { }; - - seabreeze = callPackage ../development/python-modules/seabreeze { }; - - selenium = callPackage ../development/python-modules/selenium { }; - - serpy = callPackage ../development/python-modules/serpy { }; - - setuptools_scm = callPackage ../development/python-modules/setuptools_scm { }; - - setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { }; - - serverlessrepo = callPackage ../development/python-modules/serverlessrepo { }; - - shippai = callPackage ../development/python-modules/shippai {}; - - shutilwhich = callPackage ../development/python-modules/shutilwhich { }; - - simanneal = callPackage ../development/python-modules/simanneal { }; - - simplegeneric = callPackage ../development/python-modules/simplegeneric { }; - - shamir-mnemonic = callPackage ../development/python-modules/shamir-mnemonic { }; - - shodan = callPackage ../development/python-modules/shodan { }; - - should-dsl = callPackage ../development/python-modules/should-dsl { }; - - showit = callPackage ../development/python-modules/showit { }; - - simplejson = callPackage ../development/python-modules/simplejson { }; - - simplekml = callPackage ../development/python-modules/simplekml { }; - - slimit = callPackage ../development/python-modules/slimit { }; - - snowflake-connector-python = callPackage ../development/python-modules/snowflake-connector-python { }; - - snowflake-sqlalchemy = callPackage ../development/python-modules/snowflake-sqlalchemy { }; - - snowballstemmer = callPackage ../development/python-modules/snowballstemmer { }; - - snitun = callPackage ../development/python-modules/snitun { }; - - snscrape = callPackage ../development/python-modules/snscrape { }; - - snug = callPackage ../development/python-modules/snug { }; - - snuggs = callPackage ../development/python-modules/snuggs { }; - - spake2 = callPackage ../development/python-modules/spake2 { }; - - sphfile = callPackage ../development/python-modules/sphfile { }; - - supervisor = callPackage ../development/python-modules/supervisor {}; - - subprocess32 = callPackage ../development/python-modules/subprocess32 { }; - - spark_parser = callPackage ../development/python-modules/spark_parser { }; - - sphinx = if isPy3k then - callPackage ../development/python-modules/sphinx { } - else - callPackage ../development/python-modules/sphinx/2.nix { }; - - # Only exists for a Haskell package. - sphinx_1_7_9 = (callPackage ../development/python-modules/sphinx/2.nix { }) - .overridePythonAttrs (oldAttrs: rec { - version = "1.7.9"; - src = oldAttrs.src.override { - inherit version; - sha256 = "217a7705adcb573da5bbe1e0f5cab4fa0bd89fd9342c9159121746f593c2d5a4"; - }; - }); - - sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { }; - - sphinxcontrib-websupport = if isPy3k then - callPackage ../development/python-modules/sphinxcontrib-websupport { } - else - callPackage ../development/python-modules/sphinxcontrib-websupport/1_1.nix { }; - - hieroglyph = callPackage ../development/python-modules/hieroglyph { }; - - hvplot = callPackage ../development/python-modules/hvplot { }; - - guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { }; - - sphinx-testing = callPackage ../development/python-modules/sphinx-testing { }; - - sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp {}; - - sphinxcontrib-devhelp = callPackage ../development/python-modules/sphinxcontrib-devhelp {}; - - sphinxcontrib-fulltoc = callPackage ../development/python-modules/sphinxcontrib-fulltoc { }; - - sphinxcontrib-htmlhelp = callPackage ../development/python-modules/sphinxcontrib-htmlhelp {}; - - sphinxcontrib-jsmath = callPackage ../development/python-modules/sphinxcontrib-jsmath {}; - - sphinxcontrib-katex = callPackage ../development/python-modules/sphinxcontrib-katex { }; - - sphinxcontrib-qthelp = callPackage ../development/python-modules/sphinxcontrib-qthelp {}; - - sphinxcontrib-serializinghtml = callPackage ../development/python-modules/sphinxcontrib-serializinghtml {}; - - sphinxcontrib-bibtex = callPackage ../development/python-modules/sphinxcontrib-bibtex {}; - - sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree {}; - - sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { }; - - splinter = callPackage ../development/python-modules/splinter { }; - - spotipy = callPackage ../development/python-modules/spotipy { }; - - sqlalchemy = callPackage ../development/python-modules/sqlalchemy { }; - - sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { }; - - sqlalchemy-continuum = callPackage ../development/python-modules/sqlalchemy-continuum { }; - - sqlalchemy-i18n = callPackage ../development/python-modules/sqlalchemy-i18n { }; - - sqlalchemy_migrate = callPackage ../development/python-modules/sqlalchemy-migrate { }; - - sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; - - sqlsoup = callPackage ../development/python-modules/sqlsoup { }; - - staticjinja = callPackage ../development/python-modules/staticjinja { }; - - statsmodels = callPackage ../development/python-modules/statsmodels { }; - - strategies = callPackage ../development/python-modules/strategies { }; - - stravalib = callPackage ../development/python-modules/stravalib { }; - - streamz = callPackage ../development/python-modules/streamz { }; - - structlog = callPackage ../development/python-modules/structlog { }; - - stytra = callPackage ../development/python-modules/stytra { }; - - sybil = callPackage ../development/python-modules/sybil { }; - - # legacy alias - syncthing-gtk = pkgs.syncthing-gtk; - - systemd = callPackage ../development/python-modules/systemd { - inherit (pkgs) pkgconfig systemd; - }; - - sysv_ipc = callPackage ../development/python-modules/sysv_ipc { }; - - tabulate = callPackage ../development/python-modules/tabulate { }; - - tadasets = callPackage ../development/python-modules/tadasets { }; - - tasklib = callPackage ../development/python-modules/tasklib { }; - - tatsu = callPackage ../development/python-modules/tatsu { }; - - tbm-utils = callPackage ../development/python-modules/tbm-utils { }; - - tempita = callPackage ../development/python-modules/tempita { }; - - terminado = callPackage ../development/python-modules/terminado { }; - - tess = callPackage ../development/python-modules/tess { }; - - testresources = callPackage ../development/python-modules/testresources { }; - - testtools = callPackage ../development/python-modules/testtools { }; - - traitlets = callPackage ../development/python-modules/traitlets { }; - - traittypes = callPackage ../development/python-modules/traittypes { }; - - transitions = callPackage ../development/python-modules/transitions { }; - - extras = callPackage ../development/python-modules/extras { }; - - extension-helpers = callPackage ../development/python-modules/extension-helpers { }; - - texttable = callPackage ../development/python-modules/texttable { }; - - textwrap3 = callPackage ../development/python-modules/textwrap3 { }; - - tiledb = callPackage ../development/python-modules/tiledb { - inherit (pkgs) tiledb; - }; - - timezonefinder = callPackage ../development/python-modules/timezonefinder { }; - - tiros = callPackage ../development/python-modules/tiros { }; - - tinydb = callPackage ../development/python-modules/tinydb { }; - - tifffile = callPackage ../development/python-modules/tifffile { }; - - tmdb3 = callPackage ../development/python-modules/tmdb3 { }; - - toolz = callPackage ../development/python-modules/toolz { }; - - tox = callPackage ../development/python-modules/tox { }; - - tqdm = callPackage ../development/python-modules/tqdm { }; - - trytond = callPackage ../development/python-modules/trytond { }; - - smmap = callPackage ../development/python-modules/smmap { }; - - smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 - - transaction = callPackage ../development/python-modules/transaction { }; - - TurboCheetah = callPackage ../development/python-modules/TurboCheetah { }; - - tweepy = callPackage ../development/python-modules/tweepy { }; - - twill = callPackage ../development/python-modules/twill { }; - - twine = callPackage ../development/python-modules/twine { }; - - twisted = callPackage ../development/python-modules/twisted { }; - - txtorcon = callPackage ../development/python-modules/txtorcon { }; - - txdbus = callPackage ../development/python-modules/txdbus { }; - - tzlocal = callPackage ../development/python-modules/tzlocal { }; - - u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; - - ua-parser = callPackage ../development/python-modules/ua-parser { }; - - uarray = callPackage ../development/python-modules/uarray { }; - - ueberzug = callPackage ../development/python-modules/ueberzug { - inherit (pkgs.xorg) libX11 libXext; - }; - - ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { }; - - umap-learn = callPackage ../development/python-modules/umap-learn { }; - - umemcache = callPackage ../development/python-modules/umemcache {}; - - uritools = callPackage ../development/python-modules/uritools { }; - - update_checker = callPackage ../development/python-modules/update_checker {}; - - update-copyright = callPackage ../development/python-modules/update-copyright {}; - - update-dotdee = callPackage ../development/python-modules/update-dotdee { }; - - uritemplate = callPackage ../development/python-modules/uritemplate { }; - - uproot = callPackage ../development/python-modules/uproot {}; - - uproot-methods = callPackage ../development/python-modules/uproot-methods { }; - - urlgrabber = callPackage ../development/python-modules/urlgrabber {}; - - urwid = callPackage ../development/python-modules/urwid {}; - - user-agents = callPackage ../development/python-modules/user-agents { }; - - variants = callPackage ../development/python-modules/variants { }; - - verboselogs = callPackage ../development/python-modules/verboselogs { }; - - vega_datasets = callPackage ../development/python-modules/vega_datasets { }; - - vertica-python = callPackage ../development/python-modules/vertica-python { }; - - virtkey = callPackage ../development/python-modules/virtkey { - inherit (pkgs) pkgconfig; - }; - - virtual-display = callPackage ../development/python-modules/virtual-display { }; - - virtualenv = callPackage ../development/python-modules/virtualenv { }; - - vispy = callPackage ../development/python-modules/vispy { }; - - vsts = callPackage ../development/python-modules/vsts { }; - - vsts-cd-manager = callPackage ../development/python-modules/vsts-cd-manager { }; - - python-vlc = callPackage ../development/python-modules/python-vlc { }; - - weasyprint = callPackage ../development/python-modules/weasyprint { }; - - webassets = callPackage ../development/python-modules/webassets { }; - - webcolors = callPackage ../development/python-modules/webcolors { }; - - webencodings = callPackage ../development/python-modules/webencodings { }; - - websockets = callPackage ../development/python-modules/websockets { }; - - Wand = callPackage ../development/python-modules/Wand { }; - - wcwidth = callPackage ../development/python-modules/wcwidth { }; - - werkzeug = callPackage ../development/python-modules/werkzeug { }; - - wheel = callPackage ../development/python-modules/wheel { }; - - widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; - - wordfreq = callPackage ../development/python-modules/wordfreq { }; - - magic-wormhole = callPackage ../development/python-modules/magic-wormhole { }; - - magic-wormhole-mailbox-server = callPackage ../development/python-modules/magic-wormhole-mailbox-server { }; - - magic-wormhole-transit-relay = callPackage ../development/python-modules/magic-wormhole-transit-relay { }; - - wxPython = self.wxPython30; - - wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { - wxGTK = pkgs.wxGTK30; - inherit (pkgs) pkgconfig; - }; - - wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { - inherit (pkgs) pkgconfig; - wxGTK = pkgs.wxGTK30.override { withGtk2 = false; withWebKit = true; }; - }; - - xml2rfc = callPackage ../development/python-modules/xml2rfc { }; - - xmlschema = callPackage ../development/python-modules/xmlschema { }; - - xmltodict = callPackage ../development/python-modules/xmltodict { }; - - xarray = callPackage ../development/python-modules/xarray { }; - - xapian = callPackage ../development/python-modules/xapian { xapian = pkgs.xapian; }; - - xapp = callPackage ../development/python-modules/xapp { - inherit (pkgs) gtk3 gobject-introspection polkit; - inherit (pkgs.cinnamon) xapps; - }; - - xlwt = callPackage ../development/python-modules/xlwt { }; - - xxhash = callPackage ../development/python-modules/xxhash { }; - - ydiff = callPackage ../development/python-modules/ydiff { }; - - yoda = toPythonModule (pkgs.yoda.override { - inherit python; - }); - - youtube-dl = callPackage ../tools/misc/youtube-dl {}; - - youtube-dl-light = callPackage ../tools/misc/youtube-dl { - ffmpegSupport = false; - phantomjsSupport = false; - }; - - zconfig = callPackage ../development/python-modules/zconfig { }; - - zc_lockfile = callPackage ../development/python-modules/zc_lockfile { }; - - zerorpc = callPackage ../development/python-modules/zerorpc { }; - - zimports = callPackage ../development/python-modules/zimports { }; - - zipstream = callPackage ../development/python-modules/zipstream { }; - - zodb = callPackage ../development/python-modules/zodb {}; - - zodbpickle = callPackage ../development/python-modules/zodbpickle {}; - - BTrees = callPackage ../development/python-modules/btrees {}; - - persistent = callPackage ../development/python-modules/persistent {}; - - persim = callPackage ../development/python-modules/persim { }; - - xdot = callPackage ../development/python-modules/xdot { }; - - zetup = callPackage ../development/python-modules/zetup { }; + rotate-backups = callPackage ../tools/backup/rotate-backups { }; routes = callPackage ../development/python-modules/routes { }; + rpdb = callPackage ../development/python-modules/rpdb { }; + + rpkg = callPackage ../development/python-modules/rpkg { }; + + rply = callPackage ../development/python-modules/rply { }; + + rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override { inherit python; })); + + rpmfluff = callPackage ../development/python-modules/rpmfluff { }; + + rpy2 = if isPy3k then + callPackage ../development/python-modules/rpy2 { } + else + callPackage ../development/python-modules/rpy2/2.nix { }; + rpyc = callPackage ../development/python-modules/rpyc { }; + rq = callPackage ../development/python-modules/rq { }; + rsa = if isPy3k then callPackage ../development/python-modules/rsa { } else callPackage ../development/python-modules/rsa/4_0.nix { }; - squaremap = callPackage ../development/python-modules/squaremap { }; + rtmidi-python = callPackage ../development/python-modules/rtmidi-python { }; + + Rtree = callPackage ../development/python-modules/Rtree { inherit (pkgs) libspatialindex; }; + + rtslib = callPackage ../development/python-modules/rtslib { }; ruamel_base = callPackage ../development/python-modules/ruamel_base { }; @@ -6538,182 +6139,426 @@ in { ruamel_yaml_clib = callPackage ../development/python-modules/ruamel_yaml_clib { }; + rubymarshal = callPackage ../development/python-modules/rubymarshal { }; + ruffus = callPackage ../development/python-modules/ruffus { }; runsnakerun = callPackage ../development/python-modules/runsnakerun { }; - pysendfile = callPackage ../development/python-modules/pysendfile { }; + runway-python = callPackage ../development/python-modules/runway-python { }; - pyxl3 = callPackage ../development/python-modules/pyxl3 { }; + rx = callPackage ../development/python-modules/rx { }; - qpid-python = callPackage ../development/python-modules/qpid-python { }; + rxv = callPackage ../development/python-modules/rxv { }; - xattr = callPackage ../development/python-modules/xattr { }; + s2clientprotocol = callPackage ../development/python-modules/s2clientprotocol { }; + + s3fs = callPackage ../development/python-modules/s3fs { }; + + s3transfer = callPackage ../development/python-modules/s3transfer { }; + + sabyenc3 = callPackage ../development/python-modules/sabyenc3 { }; + + sabyenc = callPackage ../development/python-modules/sabyenc { }; + + sacremoses = callPackage ../development/python-modules/sacremoses { }; + + safe = callPackage ../development/python-modules/safe { }; + + safety = callPackage ../development/python-modules/safety { }; + + salmon-mail = callPackage ../development/python-modules/salmon-mail { }; + + sampledata = callPackage ../development/python-modules/sampledata { }; + + samplerate = callPackage ../development/python-modules/samplerate { }; + + samsungctl = callPackage ../development/python-modules/samsungctl { }; + + samsungtvws = callPackage ../development/python-modules/samsungtvws { }; + + sandboxlib = callPackage ../development/python-modules/sandboxlib { }; + + sanic-auth = callPackage ../development/python-modules/sanic-auth { }; + + sanic = callPackage ../development/python-modules/sanic { }; + + sapi-python-client = callPackage ../development/python-modules/sapi-python-client { }; + + sarge = callPackage ../development/python-modules/sarge { }; + + sasmodels = callPackage ../development/python-modules/sasmodels { }; + + scales = callPackage ../development/python-modules/scales { }; + + scandir = callPackage ../development/python-modules/scandir { }; + + scapy = callPackage ../development/python-modules/scapy { }; + + schedule = callPackage ../development/python-modules/schedule { }; + + schema = callPackage ../development/python-modules/schema { }; + + scikit-bio = callPackage ../development/python-modules/scikit-bio { }; + + scikit-build = callPackage ../development/python-modules/scikit-build { }; + + scikit-fmm = callPackage ../development/python-modules/scikit-fmm { }; + + scikitimage = callPackage ../development/python-modules/scikit-image { }; + + scikitlearn = let args = { inherit (pkgs) gfortran glibcLocales; }; + in if isPy3k then + callPackage ../development/python-modules/scikitlearn args + else + callPackage ../development/python-modules/scikitlearn/0.20.nix args; + + scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; + + scikits-odes = callPackage ../development/python-modules/scikits-odes { }; + + scikit-tda = callPackage ../development/python-modules/scikit-tda { }; + + scipy_1_3 = self.scipy.overridePythonAttrs (oldAttrs: rec { + version = "1.3.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "02iqb7ws7fw5fd1a83hx705pzrw1imj7z0bphjsl4bfvw254xgv4"; + }; + doCheck = false; + disabled = !isPy3k; + }); + + scipy = let + scipy_ = callPackage ../development/python-modules/scipy { }; + scipy_1_2 = scipy_.overridePythonAttrs (oldAttrs: rec { + version = "1.2.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1"; + }; + }); + in if pythonOlder "3.5" then scipy_1_2 else scipy_; + + scour = callPackage ../development/python-modules/scour { }; + + scp = callPackage ../development/python-modules/scp { }; + + scrapy = callPackage ../development/python-modules/scrapy { }; + + scrapy-deltafetch = callPackage ../development/python-modules/scrapy-deltafetch { }; + + scrapy-fake-useragent = callPackage ../development/python-modules/scrapy-fake-useragent { }; + + scrapy-splash = callPackage ../development/python-modules/scrapy-splash { }; + + screeninfo = callPackage ../development/python-modules/screeninfo { }; scripttest = callPackage ../development/python-modules/scripttest { }; + scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; }; + + sdnotify = callPackage ../development/python-modules/sdnotify { }; + + seaborn = if isPy3k then + callPackage ../development/python-modules/seaborn { } + else + callPackage ../development/python-modules/seaborn/0.9.1.nix { }; + + seabreeze = callPackage ../development/python-modules/seabreeze { }; + + secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1 pkgconfig; }; + + secretstorage = if isPy3k then + callPackage ../development/python-modules/secretstorage { } + else + callPackage ../development/python-modules/secretstorage/2.nix { }; + + secure = callPackage ../development/python-modules/secure { }; + + seekpath = callPackage ../development/python-modules/seekpath { }; + + selectors2 = callPackage ../development/python-modules/selectors2 { }; + + selectors34 = callPackage ../development/python-modules/selectors34 { }; + + selenium = callPackage ../development/python-modules/selenium { }; + + semantic = callPackage ../development/python-modules/semantic { }; + + semantic-version = callPackage ../development/python-modules/semantic-version { }; + + semver = callPackage ../development/python-modules/semver { }; + + send2trash = callPackage ../development/python-modules/send2trash { }; + + sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece pkgconfig; }; + + sentinel = callPackage ../development/python-modules/sentinel { }; + + sentry-sdk = callPackage ../development/python-modules/sentry-sdk { }; + + sepaxml = callPackage ../development/python-modules/sepaxml { }; + + seqdiag = callPackage ../development/python-modules/seqdiag { }; + + sequoia = disabledIf (isPyPy || !isPy3k) (toPythonModule (pkgs.sequoia.override { + pythonPackages = self; + pythonSupport = true; + })); + + serpent = callPackage ../development/python-modules/serpent { }; + + serpy = callPackage ../development/python-modules/serpy { }; + + serverlessrepo = callPackage ../development/python-modules/serverlessrepo { }; + + serversyncstorage = callPackage ../development/python-modules/serversyncstorage { }; + + service-identity = callPackage ../development/python-modules/service_identity { }; + + setproctitle = callPackage ../development/python-modules/setproctitle { }; + setuptoolsDarcs = callPackage ../development/python-modules/setuptoolsdarcs { }; + setuptools-git = callPackage ../development/python-modules/setuptools-git { }; + + setuptools-lint = callPackage ../development/python-modules/setuptools-lint { }; + + setuptools_scm = callPackage ../development/python-modules/setuptools_scm { }; + + setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { }; + setuptoolsTrial = callPackage ../development/python-modules/setuptoolstrial { }; - simplebayes = callPackage ../development/python-modules/simplebayes { }; + sexpdata = callPackage ../development/python-modules/sexpdata { }; - shortuuid = callPackage ../development/python-modules/shortuuid { }; + sfepy = callPackage ../development/python-modules/sfepy { }; - shouldbe = callPackage ../development/python-modules/shouldbe { }; - - simpleparse = callPackage ../development/python-modules/simpleparse { }; - - slob = callPackage ../development/python-modules/slob { }; - - slowaes = callPackage ../development/python-modules/slowaes { }; - - sqlite3dbm = callPackage ../development/python-modules/sqlite3dbm { }; - - sqlitedict = callPackage ../development/python-modules/sqlitedict { }; - - sqlobject = callPackage ../development/python-modules/sqlobject { }; - - sqlmap = callPackage ../development/python-modules/sqlmap { }; - - pgpdump = callPackage ../development/python-modules/pgpdump { }; - - spambayes = callPackage ../development/python-modules/spambayes { }; + shamir-mnemonic = callPackage ../development/python-modules/shamir-mnemonic { }; shapely = callPackage ../development/python-modules/shapely { }; sharedmem = callPackage ../development/python-modules/sharedmem { }; - soco = callPackage ../development/python-modules/soco { }; - - sopel = callPackage ../development/python-modules/sopel { }; - - sounddevice = callPackage ../development/python-modules/sounddevice { }; - - stevedore = callPackage ../development/python-modules/stevedore {}; - - svglib = callPackage ../development/python-modules/svglib { }; - - text-unidecode = callPackage ../development/python-modules/text-unidecode { }; - - Theano = callPackage ../development/python-modules/Theano rec { - cudaSupport = pkgs.config.cudaSupport or false; - cudnnSupport = cudaSupport; - inherit (pkgs.linuxPackages) nvidia_x11; - }; - - TheanoWithoutCuda = self.Theano.override { - cudaSupport = false; - cudnnSupport = false; - }; - - TheanoWithCuda = self.Theano.override { - cudaSupport = true; - cudnnSupport = true; - }; - - thespian = callPackage ../development/python-modules/thespian { }; - - tidylib = callPackage ../development/python-modules/pytidylib { }; - - tilestache = callPackage ../development/python-modules/tilestache { }; - - timelib = callPackage ../development/python-modules/timelib { }; - - timeout-decorator = callPackage ../development/python-modules/timeout-decorator { }; - - pid = callPackage ../development/python-modules/pid { }; - - pip2nix = callPackage ../development/python-modules/pip2nix { }; - - pychef = callPackage ../development/python-modules/pychef { }; - - pydns = - let - py3 = callPackage ../development/python-modules/py3dns { }; - - py2 = callPackage ../development/python-modules/pydns { }; - in if isPy3k then py3 else py2; - - python-daemon = callPackage ../development/python-modules/python-daemon { }; - - python-vagrant = callPackage ../development/python-modules/python-vagrant { }; - - symengine = callPackage ../development/python-modules/symengine { - symengine = pkgs.symengine; - }; - - sympy = if isPy3k then - callPackage ../development/python-modules/sympy { } - else - callPackage ../development/python-modules/sympy/1_5.nix { }; - - pilkit = callPackage ../development/python-modules/pilkit { }; - - clint = callPackage ../development/python-modules/clint { }; - - argh = callPackage ../development/python-modules/argh { }; - - nose_progressive = callPackage ../development/python-modules/nose_progressive { }; - - blessings = callPackage ../development/python-modules/blessings { }; - - secretstorage = if isPy3k - then callPackage ../development/python-modules/secretstorage { } - else callPackage ../development/python-modules/secretstorage/2.nix { }; - - secure = callPackage ../development/python-modules/secure { }; - - semantic = callPackage ../development/python-modules/semantic { }; - - sandboxlib = callPackage ../development/python-modules/sandboxlib { }; - - sanic = callPackage ../development/python-modules/sanic { }; - - scales = callPackage ../development/python-modules/scales { }; - - secp256k1 = callPackage ../development/python-modules/secp256k1 { - inherit (pkgs) secp256k1 pkgconfig; - }; - - semantic-version = callPackage ../development/python-modules/semantic-version { }; - - sexpdata = callPackage ../development/python-modules/sexpdata { }; - sh = callPackage ../development/python-modules/sh { }; + shellingham = callPackage ../development/python-modules/shellingham { }; + + shiboken2 = + toPythonModule (callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake qt5 llvmPackages; }); + + shippai = callPackage ../development/python-modules/shippai { }; + + shodan = callPackage ../development/python-modules/shodan { }; + + shortuuid = callPackage ../development/python-modules/shortuuid { }; + + shouldbe = callPackage ../development/python-modules/shouldbe { }; + + should-dsl = callPackage ../development/python-modules/should-dsl { }; + + showit = callPackage ../development/python-modules/showit { }; + + shutilwhich = callPackage ../development/python-modules/shutilwhich { }; + + sievelib = callPackage ../development/python-modules/sievelib { }; + + signedjson = callPackage ../development/python-modules/signedjson { }; + + sigtools = callPackage ../development/python-modules/sigtools { }; + + simanneal = callPackage ../development/python-modules/simanneal { }; + + simpleai = callPackage ../development/python-modules/simpleai { }; + + simpleaudio = callPackage ../development/python-modules/simpleaudio { }; + + simplebayes = callPackage ../development/python-modules/simplebayes { }; + + simpleeval = callPackage ../development/python-modules/simpleeval { }; + + simplefix = callPackage ../development/python-modules/simplefix { }; + + simplegeneric = callPackage ../development/python-modules/simplegeneric { }; + + simplejson = callPackage ../development/python-modules/simplejson { }; + + simplekml = callPackage ../development/python-modules/simplekml { }; + + simpleparse = callPackage ../development/python-modules/simpleparse { }; + + simple-salesforce = callPackage ../development/python-modules/simple-salesforce { }; + + simple-websocket-server = callPackage ../development/python-modules/simple-websocket-server { }; + + simpy = callPackage ../development/python-modules/simpy { }; + + singledispatch = callPackage ../development/python-modules/singledispatch { }; + + sip = callPackage ../development/python-modules/sip { }; + sipsimple = callPackage ../development/python-modules/sipsimple { }; six = callPackage ../development/python-modules/six { }; + skein = callPackage ../development/python-modules/skein { }; + + sklearn-deap = callPackage ../development/python-modules/sklearn-deap { }; + + skorch = callPackage ../development/python-modules/skorch { }; + + slackclient = callPackage ../development/python-modules/slackclient { }; + + sleekxmpp = callPackage ../development/python-modules/sleekxmpp { }; + + slicedimage = callPackage ../development/python-modules/slicedimage { }; + + slicerator = callPackage ../development/python-modules/slicerator { }; + + slimit = callPackage ../development/python-modules/slimit { }; + + slither-analyzer = callPackage ../development/python-modules/slither-analyzer { }; + + slixmpp = callPackage ../development/python-modules/slixmpp { inherit (pkgs) gnupg; }; + + slob = callPackage ../development/python-modules/slob { }; + + slowaes = callPackage ../development/python-modules/slowaes { }; + + sly = callPackage ../development/python-modules/sly { }; + smartdc = callPackage ../development/python-modules/smartdc { }; + smart_open = callPackage ../development/python-modules/smart_open { }; + + smartypants = callPackage ../development/python-modules/smartypants { }; + + smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 + + smmap = callPackage ../development/python-modules/smmap { }; + smpplib = callPackage ../development/python-modules/smpplib { }; - socksipy-branch = callPackage ../development/python-modules/socksipy-branch { }; + smugline = callPackage ../development/python-modules/smugline { }; + + smugpy = callPackage ../development/python-modules/smugpy { }; + + snakebite = callPackage ../development/python-modules/snakebite { }; + + snakeviz = callPackage ../development/python-modules/snakeviz { }; + + snapcast = callPackage ../development/python-modules/snapcast { }; + + snapperGUI = callPackage ../development/python-modules/snappergui { }; + + sniffio = callPackage ../development/python-modules/sniffio { }; + + snitun = callPackage ../development/python-modules/snitun { }; + + snowballstemmer = callPackage ../development/python-modules/snowballstemmer { }; + + snowflake-connector-python = callPackage ../development/python-modules/snowflake-connector-python { }; + + snowflake-sqlalchemy = callPackage ../development/python-modules/snowflake-sqlalchemy { }; + + snscrape = callPackage ../development/python-modules/snscrape { }; + + snug = callPackage ../development/python-modules/snug { }; + + snuggs = callPackage ../development/python-modules/snuggs { }; + + soapysdr = toPythonModule (pkgs.soapysdr.override { + python = self.python; + usePython = true; + }); + + soapysdr-with-plugins = toPythonModule (pkgs.soapysdr-with-plugins.override { + python = self.python; + usePython = true; + }); sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { }; + socksipy-branch = callPackage ../development/python-modules/socksipy-branch { }; + + soco = callPackage ../development/python-modules/soco { }; + + softlayer = callPackage ../development/python-modules/softlayer { }; + + solo-python = disabledIf (!pythonAtLeast "3.6") (callPackage ../development/python-modules/solo-python { }); + + somajo = callPackage ../development/python-modules/somajo { }; + + sopel = callPackage ../development/python-modules/sopel { }; + sorl_thumbnail = callPackage ../development/python-modules/sorl_thumbnail { }; + sortedcollections = callPackage ../development/python-modules/sortedcollections { }; + + sortedcontainers = callPackage ../development/python-modules/sortedcontainers { }; + + sounddevice = callPackage ../development/python-modules/sounddevice { }; + + soundfile = callPackage ../development/python-modules/soundfile { }; + soupsieve = if isPy3k then callPackage ../development/python-modules/soupsieve { } else callPackage ../development/python-modules/soupsieve/1.nix { }; - sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { }; + spacy = callPackage ../development/python-modules/spacy { }; + + spacy_models = callPackage ../development/python-modules/spacy/models.nix { }; + + spake2 = callPackage ../development/python-modules/spake2 { }; + + spambayes = callPackage ../development/python-modules/spambayes { }; + + spark_parser = callPackage ../development/python-modules/spark_parser { }; + + SPARQLWrapper = callPackage ../development/python-modules/sparqlwrapper { }; + + sparse = callPackage ../development/python-modules/sparse { }; + + speaklater = callPackage ../development/python-modules/speaklater { }; + + spectral-cube = callPackage ../development/python-modules/spectral-cube { }; + + speedtest-cli = callPackage ../development/python-modules/speedtest-cli { }; + + spglib = callPackage ../development/python-modules/spglib { }; + + sphfile = callPackage ../development/python-modules/sphfile { }; + + sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { }; + + sphinxcontrib-bibtex = callPackage ../development/python-modules/sphinxcontrib-bibtex { }; sphinxcontrib-blockdiag = callPackage ../development/python-modules/sphinxcontrib-blockdiag { }; - sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { }; + sphinxcontrib-devhelp = callPackage ../development/python-modules/sphinxcontrib-devhelp { }; + + sphinxcontrib-fulltoc = callPackage ../development/python-modules/sphinxcontrib-fulltoc { }; + + sphinxcontrib-htmlhelp = callPackage ../development/python-modules/sphinxcontrib-htmlhelp { }; sphinxcontrib_httpdomain = callPackage ../development/python-modules/sphinxcontrib_httpdomain { }; + sphinxcontrib-jsmath = callPackage ../development/python-modules/sphinxcontrib-jsmath { }; + + sphinxcontrib-katex = callPackage ../development/python-modules/sphinxcontrib-katex { }; + sphinxcontrib_newsfeed = callPackage ../development/python-modules/sphinxcontrib_newsfeed { }; - sphinxcontrib_plantuml = callPackage ../development/python-modules/sphinxcontrib_plantuml { - inherit (pkgs) plantuml; - }; + sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { }; + + sphinxcontrib_plantuml = + callPackage ../development/python-modules/sphinxcontrib_plantuml { inherit (pkgs) plantuml; }; + + sphinxcontrib-qthelp = callPackage ../development/python-modules/sphinxcontrib-qthelp { }; + + sphinxcontrib-serializinghtml = callPackage ../development/python-modules/sphinxcontrib-serializinghtml { }; sphinxcontrib-spelling = callPackage ../development/python-modules/sphinxcontrib-spelling { }; @@ -6721,633 +6566,227 @@ in { texLive = pkgs.texlive.combine { inherit (pkgs.texlive) scheme-small standalone pgfplots; }; }; + sphinxcontrib-websupport = if isPy3k then + callPackage ../development/python-modules/sphinxcontrib-websupport { } + else + callPackage ../development/python-modules/sphinxcontrib-websupport/1_1.nix { }; + + sphinx = if isPy3k then + callPackage ../development/python-modules/sphinx { } + else + callPackage ../development/python-modules/sphinx/2.nix { }; + + sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { }; + + sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree { }; + sphinx_pypi_upload = callPackage ../development/python-modules/sphinx_pypi_upload { }; - Pweave = callPackage ../development/python-modules/pweave { }; + sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { }; + + sphinx-testing = callPackage ../development/python-modules/sphinx-testing { }; + + spidev = callPackage ../development/python-modules/spidev { }; + + splinter = callPackage ../development/python-modules/splinter { }; + + spotipy = callPackage ../development/python-modules/spotipy { }; + + spyder = callPackage ../development/python-modules/spyder { }; + spyder_3 = callPackage ../development/python-modules/spyder/3.nix { }; + + spyder-kernels = callPackage ../development/python-modules/spyder-kernels { }; + spyder-kernels_0_5 = callPackage ../development/python-modules/spyder-kernels/0.x.nix { }; + + sqlalchemy = callPackage ../development/python-modules/sqlalchemy { }; + + sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { }; + + sqlalchemy-continuum = callPackage ../development/python-modules/sqlalchemy-continuum { }; + + sqlalchemy-i18n = callPackage ../development/python-modules/sqlalchemy-i18n { }; SQLAlchemy-ImageAttach = callPackage ../development/python-modules/sqlalchemy-imageattach { }; + sqlalchemy_migrate = callPackage ../development/python-modules/sqlalchemy-migrate { }; + + sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; + + sqlite3dbm = callPackage ../development/python-modules/sqlite3dbm { }; + + sqlitedict = callPackage ../development/python-modules/sqlitedict { }; + + sqlmap = callPackage ../development/python-modules/sqlmap { }; + + sqlobject = callPackage ../development/python-modules/sqlobject { }; + sqlparse = callPackage ../development/python-modules/sqlparse { }; - python_statsd = callPackage ../development/python-modules/python_statsd { }; + sqlsoup = callPackage ../development/python-modules/sqlsoup { }; - skein = callPackage ../development/python-modules/skein { }; + squaremap = callPackage ../development/python-modules/squaremap { }; + + srp = callPackage ../development/python-modules/srp { }; + + srptools = callPackage ../development/python-modules/srptools { }; + + srsly = callPackage ../development/python-modules/srsly { }; + + srvlookup = callPackage ../development/python-modules/srvlookup { }; + + ssdeep = callPackage ../development/python-modules/ssdeep { }; + + ssdp = callPackage ../development/python-modules/ssdp { }; + + sseclient = callPackage ../development/python-modules/sseclient { }; + + sshpubkeys = callPackage ../development/python-modules/sshpubkeys { }; + + sshtunnel = callPackage ../development/python-modules/sshtunnel { }; + + sslib = callPackage ../development/python-modules/sslib { }; + + sslyze = callPackage ../development/python-modules/sslyze { }; + + starfish = callPackage ../development/python-modules/starfish { }; + + starlette = callPackage ../development/python-modules/starlette { }; + + staticjinja = callPackage ../development/python-modules/staticjinja { }; + + statistics = callPackage ../development/python-modules/statistics { }; + + statsd = callPackage ../development/python-modules/statsd { }; + + statsmodels = callPackage ../development/python-modules/statsmodels { }; + + stem = callPackage ../development/python-modules/stem { }; + + stevedore = callPackage ../development/python-modules/stevedore { }; + + stm32loader = callPackage ../development/python-modules/stm32loader { }; stompclient = callPackage ../development/python-modules/stompclient { }; + strategies = callPackage ../development/python-modules/strategies { }; + + stravalib = callPackage ../development/python-modules/stravalib { }; + + streamz = callPackage ../development/python-modules/streamz { }; + + strict-rfc3339 = callPackage ../development/python-modules/strict-rfc3339 { }; + + strictyaml = callPackage ../development/python-modules/strictyaml { }; + + stringcase = callPackage ../development/python-modules/stringcase { }; + + stripe = callPackage ../development/python-modules/stripe { }; + + structlog = callPackage ../development/python-modules/structlog { }; + + stumpy = callPackage ../development/python-modules/stumpy { }; + + stups-cli-support = callPackage ../development/python-modules/stups-cli-support { }; + + stups-fullstop = callPackage ../development/python-modules/stups-fullstop { }; + + stups-pierone = callPackage ../development/python-modules/stups-pierone { }; + + stups-tokens = callPackage ../development/python-modules/stups-tokens { }; + + stups-zign = callPackage ../development/python-modules/stups-zign { }; + + stytra = callPackage ../development/python-modules/stytra { }; + subdownloader = callPackage ../development/python-modules/subdownloader { }; - subunit = callPackage ../development/python-modules/subunit { - inherit (pkgs) subunit pkg-config cppunit check; - }; + subliminal = callPackage ../development/python-modules/subliminal { }; - sure = callPackage ../development/python-modules/sure { }; + subprocess32 = callPackage ../development/python-modules/subprocess32 { }; - svgwrite = callPackage ../development/python-modules/svgwrite { }; - - swagger-spec-validator = callPackage ../development/python-modules/swagger-spec-validator { }; - - openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { }; - - freezegun = callPackage ../development/python-modules/freezegun { }; - - taskw = callPackage ../development/python-modules/taskw { }; - - telethon = callPackage ../development/python-modules/telethon { }; - - telethon-session-sqlalchemy = callPackage ../development/python-modules/telethon-session-sqlalchemy { }; - - terminaltables = callPackage ../development/python-modules/terminaltables { }; - - test-tube = callPackage ../development/python-modules/test-tube { }; - - testpath = callPackage ../development/python-modules/testpath { }; - - testrepository = callPackage ../development/python-modules/testrepository { }; - - testscenarios = callPackage ../development/python-modules/testscenarios { }; - - python_mimeparse = callPackage ../development/python-modules/python_mimeparse { }; - - # Tkinter/tkinter is part of the Python standard library. - # The Python interpreters in Nixpkgs come without tkinter by default. - # To make the module available, we make it available as any other - # Python package. - tkinter = let - py = python.override{x11Support=true;}; - in callPackage ../development/python-modules/tkinter { py = py; }; - - tlslite-ng = callPackage ../development/python-modules/tlslite-ng { }; - - qrcode = callPackage ../development/python-modules/qrcode { }; - - traits = callPackage ../development/python-modules/traits { }; - - transmissionrpc = callPackage ../development/python-modules/transmissionrpc { }; - - eggdeps = callPackage ../development/python-modules/eggdeps { }; - - twiggy = callPackage ../development/python-modules/twiggy { }; - - twitter = callPackage ../development/python-modules/twitter { }; - - twitter-common-collections = callPackage ../development/python-modules/twitter-common-collections { }; - - twitter-common-confluence = callPackage ../development/python-modules/twitter-common-confluence { }; - - twitter-common-dirutil = callPackage ../development/python-modules/twitter-common-dirutil { }; - - twitter-common-lang = callPackage ../development/python-modules/twitter-common-lang { }; - - twitter-common-log = callPackage ../development/python-modules/twitter-common-log { }; - - twitter-common-options = callPackage ../development/python-modules/twitter-common-options { }; - - python-twitter = callPackage ../development/python-modules/python-twitter { }; - - umalqurra = callPackage ../development/python-modules/umalqurra { }; - - unicodecsv = callPackage ../development/python-modules/unicodecsv { }; - - unicode-slugify = callPackage ../development/python-modules/unicode-slugify { }; - - unidiff = callPackage ../development/python-modules/unidiff { }; - - units = callPackage ../development/python-modules/units { }; - - unittest-data-provider = callPackage ../development/python-modules/unittest-data-provider { }; - - unittest2 = callPackage ../development/python-modules/unittest2 { }; - - unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; - - untangle = callPackage ../development/python-modules/untangle { }; - - traceback2 = callPackage ../development/python-modules/traceback2 { }; - - trackpy = callPackage ../development/python-modules/trackpy { }; - - linecache2 = callPackage ../development/python-modules/linecache2 { }; - - upass = callPackage ../development/python-modules/upass { }; - - uptime = callPackage ../development/python-modules/uptime { }; - - urwidtrees = callPackage ../development/python-modules/urwidtrees { }; - - pyuv = callPackage ../development/python-modules/pyuv { }; - - virtualenv-clone = callPackage ../development/python-modules/virtualenv-clone { }; - - virtualenvwrapper = callPackage ../development/python-modules/virtualenvwrapper { }; - - vmprof = callPackage ../development/python-modules/vmprof { }; - - vultr = callPackage ../development/python-modules/vultr { }; - - vulture = callPackage ../development/python-modules/vulture { }; - - wadllib = callPackage ../development/python-modules/wadllib { }; - - waitress = callPackage ../development/python-modules/waitress { }; - - waitress-django = callPackage ../development/python-modules/waitress-django { }; - - web = callPackage ../development/python-modules/web { }; - - webob = callPackage ../development/python-modules/webob { }; - - websockify = callPackage ../development/python-modules/websockify { }; - - webtest = callPackage ../development/python-modules/webtest { }; - - wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { }; - - wsgitools = callPackage ../development/python-modules/wsgitools { }; - - wurlitzer = callPackage ../development/python-modules/wurlitzer { }; - - xcaplib = callPackage ../development/python-modules/xcaplib { }; - - xlib = callPackage ../development/python-modules/xlib { }; - - yappi = callPackage ../development/python-modules/yappi { }; - - zbase32 = callPackage ../development/python-modules/zbase32 { }; - - zdaemon = callPackage ../development/python-modules/zdaemon { }; - - zfec = callPackage ../development/python-modules/zfec { }; - - zha-quirks = callPackage ../development/python-modules/zha-quirks { }; - - zipp = if pythonOlder "3.6" then - callPackage ../development/python-modules/zipp/1.nix { } - else - callPackage ../development/python-modules/zipp { }; - - zope_broken = callPackage ../development/python-modules/zope_broken { }; - - zope_component = callPackage ../development/python-modules/zope_component { }; - - zope_configuration = callPackage ../development/python-modules/zope_configuration { }; - - zope_contenttype = callPackage ../development/python-modules/zope_contenttype { }; - - zope-deferredimport = callPackage ../development/python-modules/zope-deferredimport { }; - - zope_dottedname = callPackage ../development/python-modules/zope_dottedname { }; - - zope_event = callPackage ../development/python-modules/zope_event { }; - - zope_exceptions = callPackage ../development/python-modules/zope_exceptions { }; - - zope_filerepresentation = callPackage ../development/python-modules/zope_filerepresentation { }; - - zope-hookable = callPackage ../development/python-modules/zope-hookable { }; - - zope_i18n = callPackage ../development/python-modules/zope_i18n { }; - - zope_i18nmessageid = callPackage ../development/python-modules/zope_i18nmessageid { }; - - zope_lifecycleevent = callPackage ../development/python-modules/zope_lifecycleevent { }; - - zope_location = callPackage ../development/python-modules/zope_location { }; - - zope_proxy = callPackage ../development/python-modules/zope_proxy { }; - - zope_schema = callPackage ../development/python-modules/zope_schema { }; - - zope_size = callPackage ../development/python-modules/zope_size { }; - - zope_testing = callPackage ../development/python-modules/zope_testing { }; - - zope_testrunner = callPackage ../development/python-modules/zope_testrunner { }; - - zope_interface = callPackage ../development/python-modules/zope_interface { }; - - hgsvn = callPackage ../development/python-modules/hgsvn { }; - - cliapp = callPackage ../development/python-modules/cliapp { }; - - cmdtest = callPackage ../development/python-modules/cmdtest { }; - - tornado = if isPy3k then - callPackage ../development/python-modules/tornado { } - else - callPackage ../development/python-modules/tornado/5.nix { }; - - # Used by circus and grab-site, 2020-08-29 - tornado_4 = callPackage ../development/python-modules/tornado/4.nix { }; - - # Used by luigi, 2020-08-29 - tornado_5 = callPackage ../development/python-modules/tornado/5.nix { }; - - tokenlib = callPackage ../development/python-modules/tokenlib { }; - - tunigo = callPackage ../development/python-modules/tunigo { }; - - tarman = callPackage ../development/python-modules/tarman { }; - - libarchive = self.python-libarchive; # The latter is the name upstream uses - - python-libarchive = callPackage ../development/python-modules/python-libarchive { }; - - python-logstash = callPackage ../development/python-modules/python-logstash { }; - - libarchive-c = callPackage ../development/python-modules/libarchive-c { - inherit (pkgs) libarchive; - }; - - libasyncns = callPackage ../development/python-modules/libasyncns { - inherit (pkgs) libasyncns pkgconfig; - }; - - pybrowserid = callPackage ../development/python-modules/pybrowserid { }; - - pyzmq = callPackage ../development/python-modules/pyzmq { }; - - testfixtures = callPackage ../development/python-modules/testfixtures {}; - - tissue = callPackage ../development/python-modules/tissue { }; - - titlecase = callPackage ../development/python-modules/titlecase { }; - - tracing = callPackage ../development/python-modules/tracing { }; - - traitsui = callPackage ../development/python-modules/traitsui { }; - - translationstring = callPackage ../development/python-modules/translationstring { }; - - ttystatus = callPackage ../development/python-modules/ttystatus { }; - - larch = callPackage ../development/python-modules/larch { }; - - websocket_client = callPackage ../development/python-modules/websocket_client { }; - - webhelpers = callPackage ../development/python-modules/webhelpers { }; - - whichcraft = callPackage ../development/python-modules/whichcraft { }; - - whisper = callPackage ../development/python-modules/whisper { }; - - worldengine = callPackage ../development/python-modules/worldengine { }; - - carbon = callPackage ../development/python-modules/carbon { }; - - ujson = if isPy27 - then callPackage ../development/python-modules/ujson/2.nix { } - else callPackage ../development/python-modules/ujson { }; - - unidecode = callPackage ../development/python-modules/unidecode {}; - - pyusb = callPackage ../development/python-modules/pyusb { libusb1 = pkgs.libusb1; }; - - BlinkStick = callPackage ../development/python-modules/blinkstick { }; - - usbtmc = callPackage ../development/python-modules/usbtmc {}; - - txgithub = callPackage ../development/python-modules/txgithub { }; - - txrequests = callPackage ../development/python-modules/txrequests { }; - - txamqp = callPackage ../development/python-modules/txamqp { }; - - versiontools = callPackage ../development/python-modules/versiontools { }; - - veryprettytable = callPackage ../development/python-modules/veryprettytable { }; - - graphite-web = callPackage ../development/python-modules/graphite-web { }; - - graphite_api = callPackage ../development/python-modules/graphite-api { }; - - graphite_beacon = callPackage ../development/python-modules/graphite_beacon { }; - - graph_nets = callPackage ../development/python-modules/graph_nets { }; - - graspy = callPackage ../development/python-modules/graspy { }; - - influxgraph = callPackage ../development/python-modules/influxgraph { }; - - pyspotify = callPackage ../development/python-modules/pyspotify { }; - - pykka = callPackage ../development/python-modules/pykka { }; - - ws4py = callPackage ../development/python-modules/ws4py {}; - - gdata = callPackage ../development/python-modules/gdata { }; - - IMAPClient = callPackage ../development/python-modules/imapclient { }; - - Logbook = callPackage ../development/python-modules/Logbook { }; - - libversion = callPackage ../development/python-modules/libversion { - inherit (pkgs) libversion pkgconfig; - }; - - libvirt = if isPy3k then (callPackage ../development/python-modules/libvirt { - inherit (pkgs) libvirt pkgconfig; - }) else (callPackage ../development/python-modules/libvirt/5.9.0.nix { - inherit (pkgs) pkgconfig; - libvirt = pkgs.libvirt_5_9_0; - }); - - rpdb = callPackage ../development/python-modules/rpdb { }; - - grequests = callPackage ../development/python-modules/grequests { }; - - first = callPackage ../development/python-modules/first {}; - - flaskbabel = callPackage ../development/python-modules/flaskbabel { }; - - speaklater = callPackage ../development/python-modules/speaklater { }; - - speedtest-cli = callPackage ../development/python-modules/speedtest-cli { }; - - pushbullet = callPackage ../development/python-modules/pushbullet { }; - - power = callPackage ../development/python-modules/power { }; - - pythonefl = callPackage ../development/python-modules/python-efl { - inherit (pkgs) pkgconfig; - }; - - tlsh = callPackage ../development/python-modules/tlsh { }; - - toposort = callPackage ../development/python-modules/toposort { }; - - snakebite = callPackage ../development/python-modules/snakebite { }; - - snapperGUI = callPackage ../development/python-modules/snappergui { }; - - dm-sonnet = callPackage ../development/python-modules/dm-sonnet { }; - - uncertainties = callPackage ../development/python-modules/uncertainties { }; - - funcy = callPackage ../development/python-modules/funcy { }; - - vxi11 = callPackage ../development/python-modules/vxi11 { }; - - svg2tikz = callPackage ../development/python-modules/svg2tikz { }; - - WSGIProxy = callPackage ../development/python-modules/wsgiproxy { }; - - blist = callPackage ../development/python-modules/blist { }; - - canonicaljson = callPackage ../development/python-modules/canonicaljson { }; - - daemonize = callPackage ../development/python-modules/daemonize { }; - - pydenticon = callPackage ../development/python-modules/pydenticon { }; - - pynac = callPackage ../development/python-modules/pynac { }; - - pybindgen = callPackage ../development/python-modules/pybindgen {}; - - pygccxml = callPackage ../development/python-modules/pygccxml {}; - - pymacaroons = callPackage ../development/python-modules/pymacaroons { }; - - pynacl = callPackage ../development/python-modules/pynacl { }; - - service-identity = callPackage ../development/python-modules/service_identity { }; - - signedjson = callPackage ../development/python-modules/signedjson { }; - - unpaddedbase64 = callPackage ../development/python-modules/unpaddedbase64 { }; - - thumbor = callPackage ../development/python-modules/thumbor { }; - - thumborPexif = callPackage ../development/python-modules/thumborpexif { }; - - pync = callPackage ../development/python-modules/pync { }; - - weboob = callPackage ../development/python-modules/weboob { }; - - datadiff = callPackage ../development/python-modules/datadiff { }; - - termcolor = callPackage ../development/python-modules/termcolor { }; - - html2text = if isPy3k then callPackage ../development/python-modules/html2text { } - else callPackage ../development/python-modules/html2text/2018.nix { }; - - pychart = callPackage ../development/python-modules/pychart {}; - - parsimonious = callPackage ../development/python-modules/parsimonious { }; - - networkx = if isPy3k then callPackage ../development/python-modules/networkx { } - else - callPackage ../development/python-modules/networkx/2.2.nix { }; - - ofxclient = callPackage ../development/python-modules/ofxclient {}; - - ofxhome = callPackage ../development/python-modules/ofxhome { }; - - ofxparse = callPackage ../development/python-modules/ofxparse { }; - - ofxtools = callPackage ../development/python-modules/ofxtools { }; - - orm = callPackage ../development/python-modules/orm { }; - - basemap = callPackage ../development/python-modules/basemap { }; - - dict2xml = callPackage ../development/python-modules/dict2xml { }; - - dicttoxml = callPackage ../development/python-modules/dicttoxml { }; - - markdown2 = callPackage ../development/python-modules/markdown2 { }; - - evernote = callPackage ../development/python-modules/evernote { }; - - setproctitle = callPackage ../development/python-modules/setproctitle { }; - - thrift = callPackage ../development/python-modules/thrift { }; - - geeknote = callPackage ../development/python-modules/geeknote { }; - - trollius = callPackage ../development/python-modules/trollius {}; - - pynvim = callPackage ../development/python-modules/pynvim {}; - - typogrify = callPackage ../development/python-modules/typogrify { }; - - smartypants = callPackage ../development/python-modules/smartypants { }; - - pypeg2 = callPackage ../development/python-modules/pypeg2 { }; - - torchvision = callPackage ../development/python-modules/torchvision { }; - - torchgpipe = callPackage ../development/python-modules/torchgpipe { }; - - jenkinsapi = callPackage ../development/python-modules/jenkinsapi { }; - - jenkins-job-builder = callPackage ../development/python-modules/jenkins-job-builder { }; - - dot2tex = callPackage ../development/python-modules/dot2tex { - inherit (pkgs) graphviz; - }; - - poezio = callPackage ../applications/networking/instant-messengers/poezio { - inherit (pkgs) pkgconfig; - }; - - potr = callPackage ../development/python-modules/potr {}; - - pyregion = callPackage ../development/python-modules/pyregion {}; - - python-nomad = callPackage ../development/python-modules/python-nomad { }; - - python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { }; - - python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; - - pluggy = callPackage ../development/python-modules/pluggy {}; - - xcffib = callPackage ../development/python-modules/xcffib {}; - - xpybutil = callPackage ../development/python-modules/xpybutil {}; - - pafy = callPackage ../development/python-modules/pafy { }; + subunit = callPackage ../development/python-modules/subunit { inherit (pkgs) subunit pkg-config cppunit check; }; suds = callPackage ../development/python-modules/suds { }; suds-jurko = callPackage ../development/python-modules/suds-jurko { }; - mailcap-fix = callPackage ../development/python-modules/mailcap-fix { }; + sumo = callPackage ../development/python-modules/sumo { }; - maildir-deduplicate = callPackage ../development/python-modules/maildir-deduplicate { }; + sunpy = callPackage ../development/python-modules/sunpy { }; - d2to1 = callPackage ../development/python-modules/d2to1 { }; + supervise_api = callPackage ../development/python-modules/supervise_api { }; - ovh = callPackage ../development/python-modules/ovh { }; + supervisor = callPackage ../development/python-modules/supervisor { }; - willow = callPackage ../development/python-modules/willow { }; + sure = callPackage ../development/python-modules/sure { }; - importmagic = callPackage ../development/python-modules/importmagic { }; + suseapi = callPackage ../development/python-modules/suseapi { }; - xgboost = callPackage ../development/python-modules/xgboost { - xgboost = pkgs.xgboost; - }; + svg2tikz = callPackage ../development/python-modules/svg2tikz { }; - xhtml2pdf = callPackage ../development/python-modules/xhtml2pdf { }; + svglib = callPackage ../development/python-modules/svglib { }; - xkcdpass = callPackage ../development/python-modules/xkcdpass { }; + svg-path = callPackage ../development/python-modules/svg-path { }; - xlsx2csv = callPackage ../development/python-modules/xlsx2csv { }; + svgwrite = callPackage ../development/python-modules/svgwrite { }; - xmodem = callPackage ../development/python-modules/xmodem {}; + swagger-spec-validator = callPackage ../development/python-modules/swagger-spec-validator { }; - xmpppy = callPackage ../development/python-modules/xmpppy {}; + swagger-ui-bundle = callPackage ../development/python-modules/swagger-ui-bundle { }; - xstatic = callPackage ../development/python-modules/xstatic {}; + sybil = callPackage ../development/python-modules/sybil { }; - xstatic-bootbox = callPackage ../development/python-modules/xstatic-bootbox {}; + symengine = callPackage ../development/python-modules/symengine { symengine = pkgs.symengine; }; - xstatic-bootstrap = callPackage ../development/python-modules/xstatic-bootstrap {}; + sympy = if isPy3k then + callPackage ../development/python-modules/sympy { } + else + callPackage ../development/python-modules/sympy/1_5.nix { }; - xstatic-jquery = callPackage ../development/python-modules/xstatic-jquery {}; + systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) pkgconfig systemd; }; - xstatic-jquery-file-upload = callPackage ../development/python-modules/xstatic-jquery-file-upload {}; + sysv_ipc = callPackage ../development/python-modules/sysv_ipc { }; - xstatic-jquery-ui = callPackage ../development/python-modules/xstatic-jquery-ui {}; + tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; - xstatic-pygments = callPackage ../development/python-modules/xstatic-pygments {}; + tables = if isPy3k then + callPackage ../development/python-modules/tables { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; } + else + callPackage ../development/python-modules/tables/3.5.nix { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; }; - xvfbwrapper = callPackage ../development/python-modules/xvfbwrapper { - inherit (pkgs.xorg) xorgserver; - }; + tablib = callPackage ../development/python-modules/tablib { }; - hidapi = callPackage ../development/python-modules/hidapi { - inherit (pkgs) udev libusb1; - }; + tabulate = callPackage ../development/python-modules/tabulate { }; - ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; + tadasets = callPackage ../development/python-modules/tadasets { }; - mnemonic = callPackage ../development/python-modules/mnemonic { }; + tag-expressions = callPackage ../development/python-modules/tag-expressions { }; - keepkey = callPackage ../development/python-modules/keepkey { }; + tarman = callPackage ../development/python-modules/tarman { }; - keepkey_agent = callPackage ../development/python-modules/keepkey_agent { }; + tasklib = callPackage ../development/python-modules/tasklib { }; - libagent = callPackage ../development/python-modules/libagent { }; + taskw = callPackage ../development/python-modules/taskw { }; - ledger_agent = callPackage ../development/python-modules/ledger_agent { }; + tatsu = callPackage ../development/python-modules/tatsu { }; - ledgerblue = callPackage ../development/python-modules/ledgerblue { }; + tblib = callPackage ../development/python-modules/tblib { }; - ecpy = callPackage ../development/python-modules/ecpy { }; + tbm-utils = callPackage ../development/python-modules/tbm-utils { }; - semver = callPackage ../development/python-modules/semver { }; + telegram = callPackage ../development/python-modules/telegram { }; - ed25519 = callPackage ../development/python-modules/ed25519 { }; + telethon = callPackage ../development/python-modules/telethon { }; - trezor = callPackage ../development/python-modules/trezor { }; + telethon-session-sqlalchemy = callPackage ../development/python-modules/telethon-session-sqlalchemy { }; - trezor_agent = callPackage ../development/python-modules/trezor_agent { }; + tempita = callPackage ../development/python-modules/tempita { }; - x11_hash = callPackage ../development/python-modules/x11_hash { }; + tempora = callPackage ../development/python-modules/tempora { }; - termstyle = callPackage ../development/python-modules/termstyle { }; + tenacity = callPackage ../development/python-modules/tenacity { }; - green = callPackage ../development/python-modules/green { }; - - topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 - - w3lib = callPackage ../development/python-modules/w3lib { }; - - queuelib = callPackage ../development/python-modules/queuelib { }; - - scrapy = callPackage ../development/python-modules/scrapy { }; - - scrapy-fake-useragent = callPackage ../development/python-modules/scrapy-fake-useragent { }; - - scrapy-deltafetch = callPackage ../development/python-modules/scrapy-deltafetch { }; - - scrapy-splash = callPackage ../development/python-modules/scrapy-splash { }; - - pandocfilters = callPackage ../development/python-modules/pandocfilters { }; - - pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { }; - - htmltreediff = callPackage ../development/python-modules/htmltreediff { }; - - repeated_test = callPackage ../development/python-modules/repeated_test { }; - - Keras = callPackage ../development/python-modules/keras { }; - - keras-applications = callPackage ../development/python-modules/keras-applications { }; - - keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { }; - - Lasagne = callPackage ../development/python-modules/lasagne { }; - - send2trash = callPackage ../development/python-modules/send2trash { }; - - sigtools = callPackage ../development/python-modules/sigtools { }; - - annoy = callPackage ../development/python-modules/annoy { }; - - clize = callPackage ../development/python-modules/clize { }; - - rl-coach = callPackage ../development/python-modules/rl-coach { }; - - zerobin = callPackage ../development/python-modules/zerobin { }; - - tensorflow-estimator = self.tensorflow-estimator_1; - - tensorflow-estimator_1 = callPackage ../development/python-modules/tensorflow-estimator/1 { }; - - tensorflow-estimator_2 = callPackage ../development/python-modules/tensorflow-estimator/2 { }; - - tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { }; - - tensorflow-tensorboard = self.tensorflow-tensorboard_1; - - tensorflow-tensorboard_1 = callPackage ../development/python-modules/tensorflow-tensorboard/1 { }; - - tensorflow-tensorboard_2 = callPackage ../development/python-modules/tensorflow-tensorboard/2 { }; - - tensorflow-bin = self.tensorflow-bin_1; + tensorboardx = callPackage ../development/python-modules/tensorboardx { }; tensorflow-bin_1 = callPackage ../development/python-modules/tensorflow/1/bin.nix { cudaSupport = pkgs.config.cudaSupport or false; @@ -7363,7 +6802,7 @@ in { cudnn = pkgs.cudnn_cudatoolkit_10; }; - tensorflow-build = self.tensorflow-build_1; + tensorflow-bin = self.tensorflow-bin_1; tensorflow-build_1 = callPackage ../development/python-modules/tensorflow/1 { cudaSupport = pkgs.config.cudaSupport or false; @@ -7385,458 +6824,536 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; }; + tensorflow-build = self.tensorflow-build_1; + + tensorflow-estimator_1 = callPackage ../development/python-modules/tensorflow-estimator/1 { }; + + tensorflow-estimator_2 = callPackage ../development/python-modules/tensorflow-estimator/2 { }; + + tensorflow-estimator = self.tensorflow-estimator_1; + + tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { }; + tensorflow = self.tensorflow_1; tensorflow_1 = self.tensorflow-build_1; tensorflow_2 = self.tensorflow-build_2; - tensorflowWithoutCuda = self.tensorflow.override { - cudaSupport = false; - }; + tensorflow-tensorboard_1 = callPackage ../development/python-modules/tensorflow-tensorboard/1 { }; - tensorflowWithCuda = self.tensorflow.override { - cudaSupport = true; - }; + tensorflow-tensorboard_2 = callPackage ../development/python-modules/tensorflow-tensorboard/2 { }; + + tensorflow-tensorboard = self.tensorflow-tensorboard_1; + + tensorflowWithCuda = self.tensorflow.override { cudaSupport = true; }; + + tensorflowWithoutCuda = self.tensorflow.override { cudaSupport = false; }; tensorly = callPackage ../development/python-modules/tensorly { }; + termcolor = callPackage ../development/python-modules/termcolor { }; + + terminado = callPackage ../development/python-modules/terminado { }; + + terminaltables = callPackage ../development/python-modules/terminaltables { }; + + termstyle = callPackage ../development/python-modules/termstyle { }; + + tess = callPackage ../development/python-modules/tess { }; + + tesserocr = callPackage ../development/python-modules/tesserocr { }; + + testfixtures = callPackage ../development/python-modules/testfixtures { }; + + testpath = callPackage ../development/python-modules/testpath { }; + + testrepository = callPackage ../development/python-modules/testrepository { }; + + testresources = callPackage ../development/python-modules/testresources { }; + + testscenarios = callPackage ../development/python-modules/testscenarios { }; + + testtools = callPackage ../development/python-modules/testtools { }; + + test-tube = callPackage ../development/python-modules/test-tube { }; + + textacy = callPackage ../development/python-modules/textacy { }; + + texttable = callPackage ../development/python-modules/texttable { }; + + text-unidecode = callPackage ../development/python-modules/text-unidecode { }; + + textwrap3 = callPackage ../development/python-modules/textwrap3 { }; + tflearn = callPackage ../development/python-modules/tflearn { }; - simpleai = callPackage ../development/python-modules/simpleai { }; + Theano = callPackage ../development/python-modules/Theano rec { + cudaSupport = pkgs.config.cudaSupport or false; + cudnnSupport = cudaSupport; + inherit (pkgs.linuxPackages) nvidia_x11; + }; - word2vec = callPackage ../development/python-modules/word2vec { }; + TheanoWithCuda = self.Theano.override { + cudaSupport = true; + cudnnSupport = true; + }; - tvdb_api = callPackage ../development/python-modules/tvdb_api { }; + TheanoWithoutCuda = self.Theano.override { + cudaSupport = false; + cudnnSupport = false; + }; - sdnotify = callPackage ../development/python-modules/sdnotify { }; + thespian = callPackage ../development/python-modules/thespian { }; - tvnamer = callPackage ../development/python-modules/tvnamer { }; + thinc = callPackage ../development/python-modules/thinc { }; threadpool = callPackage ../development/python-modules/threadpool { }; threadpoolctl = callPackage ../development/python-modules/threadpoolctl { }; - rocket-errbot = callPackage ../development/python-modules/rocket-errbot { }; + thrift = callPackage ../development/python-modules/thrift { }; - Yapsy = callPackage ../development/python-modules/yapsy { }; + thumbor = callPackage ../development/python-modules/thumbor { }; - ansi = callPackage ../development/python-modules/ansi { }; + thumborPexif = callPackage ../development/python-modules/thumborpexif { }; - pygments-better-html = callPackage ../development/python-modules/pygments-better-html { }; + tkinter = let + py = python.override{x11Support=true;}; + in callPackage ../development/python-modules/tkinter { py = py; }; - pygments-markdown-lexer = callPackage ../development/python-modules/pygments-markdown-lexer { }; + tidylib = callPackage ../development/python-modules/pytidylib { }; - telegram = callPackage ../development/python-modules/telegram { }; + tifffile = callPackage ../development/python-modules/tifffile { }; - python-telegram-bot = callPackage ../development/python-modules/python-telegram-bot { }; + tiledb = callPackage ../development/python-modules/tiledb { inherit (pkgs) tiledb; }; - irc = callPackage ../development/python-modules/irc { }; + tilestache = callPackage ../development/python-modules/tilestache { }; - jaraco_logging = callPackage ../development/python-modules/jaraco_logging { }; + timelib = callPackage ../development/python-modules/timelib { }; - jaraco_text = callPackage ../development/python-modules/jaraco_text { }; + timeout-decorator = callPackage ../development/python-modules/timeout-decorator { }; - jaraco_collections = callPackage ../development/python-modules/jaraco_collections { }; + timezonefinder = callPackage ../development/python-modules/timezonefinder { }; - jaraco_itertools = callPackage ../development/python-modules/jaraco_itertools { }; + tinycss2 = callPackage ../development/python-modules/tinycss2 { }; - inflect = callPackage ../development/python-modules/inflect { }; + tinycss = callPackage ../development/python-modules/tinycss { }; - more-itertools = if isPy27 then - callPackage ../development/python-modules/more-itertools/2.7.nix { } - else callPackage ../development/python-modules/more-itertools { }; + tinydb = callPackage ../development/python-modules/tinydb { }; - morphys = callPackage ../development/python-modules/morphys { }; + tiros = callPackage ../development/python-modules/tiros { }; - jaraco_functools = if pythonOlder "3.6" then - callPackage ../development/python-modules/jaraco_functools/2.nix { } + tissue = callPackage ../development/python-modules/tissue { }; + + titlecase = callPackage ../development/python-modules/titlecase { }; + + tld = callPackage ../development/python-modules/tld { }; + + tldextract = callPackage ../development/python-modules/tldextract { }; + + tlsh = callPackage ../development/python-modules/tlsh { }; + + tlslite-ng = callPackage ../development/python-modules/tlslite-ng { }; + + tls-parser = callPackage ../development/python-modules/tls-parser { }; + + tmdb3 = callPackage ../development/python-modules/tmdb3 { }; + + todoist = callPackage ../development/python-modules/todoist { }; + + toggl-cli = callPackage ../development/python-modules/toggl-cli { }; + + tokenizers = disabledIf (!isPy3k) (toPythonModule (callPackage ../development/python-modules/tokenizers { })); + + tokenlib = callPackage ../development/python-modules/tokenlib { }; + + tokenserver = callPackage ../development/python-modules/tokenserver { }; + + toml = callPackage ../development/python-modules/toml { }; + + tomlkit = callPackage ../development/python-modules/tomlkit { }; + + toolz = callPackage ../development/python-modules/toolz { }; + + toposort = callPackage ../development/python-modules/toposort { }; + + topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 + + torchgpipe = callPackage ../development/python-modules/torchgpipe { }; + + torchvision = callPackage ../development/python-modules/torchvision { }; + + tornado = if isPy3k then + callPackage ../development/python-modules/tornado { } else - callPackage ../development/python-modules/jaraco_functools { }; + callPackage ../development/python-modules/tornado/5.nix { }; - jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; + towncrier = callPackage ../development/python-modules/towncrier { inherit (pkgs) git; }; - jaraco_stream = if pythonOlder "3.6" - then callPackage ../development/python-modules/jaraco_stream/2.nix { } - else - callPackage ../development/python-modules/jaraco_stream { }; + tox = callPackage ../development/python-modules/tox { }; - javaobj-py3 = callPackage ../development/python-modules/javaobj-py3 { }; + tqdm = callPackage ../development/python-modules/tqdm { }; - javaproperties = callPackage ../development/python-modules/javaproperties { }; + traceback2 = callPackage ../development/python-modules/traceback2 { }; - tempora= callPackage ../development/python-modules/tempora { }; + tracing = callPackage ../development/python-modules/tracing { }; - hypchat = callPackage ../development/python-modules/hypchat { }; + trackpy = callPackage ../development/python-modules/trackpy { }; - pivy = callPackage ../development/python-modules/pivy { }; + traitlets = callPackage ../development/python-modules/traitlets { }; - smugpy = callPackage ../development/python-modules/smugpy { }; + traits = callPackage ../development/python-modules/traits { }; - smugline = callPackage ../development/python-modules/smugline { }; + traitsui = callPackage ../development/python-modules/traitsui { }; - txaio = callPackage ../development/python-modules/txaio { }; + traittypes = callPackage ../development/python-modules/traittypes { }; - ramlfications = callPackage ../development/python-modules/ramlfications { }; + transaction = callPackage ../development/python-modules/transaction { }; - yapf = callPackage ../development/python-modules/yapf { }; + transformers = callPackage ../development/python-modules/transformers { }; - black = callPackage ../development/python-modules/black { }; + transforms3d = callPackage ../development/python-modules/transforms3d { }; - bjoern = callPackage ../development/python-modules/bjoern { }; + transip = callPackage ../development/python-modules/transip { }; - autobahn = callPackage ../development/python-modules/autobahn { }; + transitions = callPackage ../development/python-modules/transitions { }; - jsonref = callPackage ../development/python-modules/jsonref { }; + translationstring = callPackage ../development/python-modules/translationstring { }; - whoosh = callPackage ../development/python-modules/whoosh { }; + transmissionrpc = callPackage ../development/python-modules/transmissionrpc { }; - packet-python = callPackage ../development/python-modules/packet-python { }; + treq = callPackage ../development/python-modules/treq { }; - pwntools = callPackage ../development/python-modules/pwntools { debugger = pkgs.gdb; }; + trezor_agent = callPackage ../development/python-modules/trezor_agent { }; - ROPGadget = callPackage ../development/python-modules/ROPGadget { }; + trezor = callPackage ../development/python-modules/trezor { }; - # We need "normal" libxml2 and not the python package by the same name. - pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; }; + trimesh = callPackage ../development/python-modules/trimesh { }; - unicorn = callPackage ../development/python-modules/unicorn { }; + trio = callPackage ../development/python-modules/trio { }; - intervaltree = callPackage ../development/python-modules/intervaltree { }; + trollius = callPackage ../development/python-modules/trollius { }; - packaging = callPackage ../development/python-modules/packaging { }; + trueskill = callPackage ../development/python-modules/trueskill { }; - preggy = callPackage ../development/python-modules/preggy { }; + trustme = callPackage ../development/python-modules/trustme { }; - prison = callPackage ../development/python-modules/prison { }; + trytond = callPackage ../development/python-modules/trytond { }; - pytoml = callPackage ../development/python-modules/pytoml { }; + ttystatus = callPackage ../development/python-modules/ttystatus { }; - pypamtest = pkgs.libpam-wrapper.override { - enablePython = true; - inherit python; - }; + tunigo = callPackage ../development/python-modules/tunigo { }; - pypandoc = callPackage ../development/python-modules/pypandoc { }; + TurboCheetah = callPackage ../development/python-modules/TurboCheetah { }; - yamllint = callPackage ../development/python-modules/yamllint { }; + tvdb_api = callPackage ../development/python-modules/tvdb_api { }; - yanc = callPackage ../development/python-modules/yanc { }; + tvnamer = callPackage ../development/python-modules/tvnamer { }; - yarl = callPackage ../development/python-modules/yarl { }; + tweepy = callPackage ../development/python-modules/tweepy { }; - solo-python = disabledIf (! pythonAtLeast "3.6") (callPackage ../development/python-modules/solo-python { }); - - suseapi = callPackage ../development/python-modules/suseapi { }; - - tensorboardx = callPackage ../development/python-modules/tensorboardx { }; - - typed-ast = callPackage ../development/python-modules/typed-ast { }; - - stripe = callPackage ../development/python-modules/stripe { }; - - strict-rfc3339 = callPackage ../development/python-modules/strict-rfc3339 { }; - - strictyaml = callPackage ../development/python-modules/strictyaml { }; + twiggy = callPackage ../development/python-modules/twiggy { }; twilio = callPackage ../development/python-modules/twilio { }; + twill = callPackage ../development/python-modules/twill { }; + + twine = callPackage ../development/python-modules/twine { }; + + twisted = callPackage ../development/python-modules/twisted { }; + + twitter = callPackage ../development/python-modules/twitter { }; + + twitter-common-collections = callPackage ../development/python-modules/twitter-common-collections { }; + + twitter-common-confluence = callPackage ../development/python-modules/twitter-common-confluence { }; + + twitter-common-dirutil = callPackage ../development/python-modules/twitter-common-dirutil { }; + + twitter-common-lang = callPackage ../development/python-modules/twitter-common-lang { }; + + twitter-common-log = callPackage ../development/python-modules/twitter-common-log { }; + + twitter-common-options = callPackage ../development/python-modules/twitter-common-options { }; + twofish = callPackage ../development/python-modules/twofish { }; + txaio = callPackage ../development/python-modules/txaio { }; + + txamqp = callPackage ../development/python-modules/txamqp { }; + + txdbus = callPackage ../development/python-modules/txdbus { }; + + txgithub = callPackage ../development/python-modules/txgithub { }; + + txrequests = callPackage ../development/python-modules/txrequests { }; + + txtorcon = callPackage ../development/python-modules/txtorcon { }; + + typed-ast = callPackage ../development/python-modules/typed-ast { }; + + typeguard = callPackage ../development/python-modules/typeguard { }; + + typesentry = callPackage ../development/python-modules/typesentry { }; + + typesystem = callPackage ../development/python-modules/typesystem { }; + + typing = callPackage ../development/python-modules/typing { }; + + typing-extensions = callPackage ../development/python-modules/typing-extensions { }; + + typing-inspect = callPackage ../development/python-modules/typing-inspect { }; + + typogrify = callPackage ../development/python-modules/typogrify { }; + + tzlocal = callPackage ../development/python-modules/tzlocal { }; + + uamqp = + callPackage ../development/python-modules/uamqp { inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork Security; }; + + ua-parser = callPackage ../development/python-modules/ua-parser { }; + + uarray = callPackage ../development/python-modules/uarray { }; + + ueberzug = callPackage ../development/python-modules/ueberzug { inherit (pkgs.xorg) libX11 libXext; }; + + ufonormalizer = callPackage ../development/python-modules/ufonormalizer { }; + + ufoprocessor = callPackage ../development/python-modules/ufoprocessor { }; + + ujson = if isPy27 then + callPackage ../development/python-modules/ujson/2.nix { } + else + callPackage ../development/python-modules/ujson { }; + + ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { }; + + umalqurra = callPackage ../development/python-modules/umalqurra { }; + + umap-learn = callPackage ../development/python-modules/umap-learn { }; + + umemcache = callPackage ../development/python-modules/umemcache { }; + + u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; + + uncertainties = callPackage ../development/python-modules/uncertainties { }; + + uncompyle6 = callPackage ../development/python-modules/uncompyle6 { }; + + unicodecsv = callPackage ../development/python-modules/unicodecsv { }; + + unicodedata2 = callPackage ../development/python-modules/unicodedata2 { }; + + unicode-slugify = callPackage ../development/python-modules/unicode-slugify { }; + + unicorn = callPackage ../development/python-modules/unicorn { }; + + unidecode = callPackage ../development/python-modules/unidecode { }; + + unidiff = callPackage ../development/python-modules/unidiff { }; + + unifi = callPackage ../development/python-modules/unifi { }; + + units = callPackage ../development/python-modules/units { }; + + unittest2 = callPackage ../development/python-modules/unittest2 { }; + + unittest-data-provider = callPackage ../development/python-modules/unittest-data-provider { }; + + unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; + + unpaddedbase64 = callPackage ../development/python-modules/unpaddedbase64 { }; + + unrpa = callPackage ../development/python-modules/unrpa { }; + + untangle = callPackage ../development/python-modules/untangle { }; + + upass = callPackage ../development/python-modules/upass { }; + + update_checker = callPackage ../development/python-modules/update_checker { }; + + update-copyright = callPackage ../development/python-modules/update-copyright { }; + + update-dotdee = callPackage ../development/python-modules/update-dotdee { }; + + uproot = callPackage ../development/python-modules/uproot { }; + + uproot-methods = callPackage ../development/python-modules/uproot-methods { }; + + uptime = callPackage ../development/python-modules/uptime { }; + uranium = callPackage ../development/python-modules/uranium { }; + uritemplate = callPackage ../development/python-modules/uritemplate { }; + + uritools = callPackage ../development/python-modules/uritools { }; + + urlgrabber = callPackage ../development/python-modules/urlgrabber { }; + + urllib3 = callPackage ../development/python-modules/urllib3 { }; + + urwid = callPackage ../development/python-modules/urwid { }; + + urwidtrees = callPackage ../development/python-modules/urwidtrees { }; + + usbtmc = callPackage ../development/python-modules/usbtmc { }; + + us = callPackage ../development/python-modules/us { }; + + user-agents = callPackage ../development/python-modules/user-agents { }; + + userpath = callPackage ../development/python-modules/userpath { }; + uuid = callPackage ../development/python-modules/uuid { }; + uvcclient = callPackage ../development/python-modules/uvcclient { }; + + uvicorn = callPackage ../development/python-modules/uvicorn { }; + + uvloop = callPackage ../development/python-modules/uvloop { + inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices; + }; + + validate-email = callPackage ../development/python-modules/validate-email { }; + + validators = callPackage ../development/python-modules/validators { }; + + validictory = callPackage ../development/python-modules/validictory { }; + + variants = callPackage ../development/python-modules/variants { }; + + varint = callPackage ../development/python-modules/varint { }; + + vcrpy = callPackage ../development/python-modules/vcrpy { }; + + vcver = callPackage ../development/python-modules/vcver { }; + + vcversioner = callPackage ../development/python-modules/vcversioner { }; + + vdf = callPackage ../development/python-modules/vdf { }; + + vdirsyncer = callPackage ../development/python-modules/vdirsyncer { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security; + inherit (pkgs) pkg-config openssl rustPlatform; + }; + + vdirsyncerStable = callPackage ../development/python-modules/vdirsyncer/stable.nix { }; + + vega = callPackage ../development/python-modules/vega { }; + + vega_datasets = callPackage ../development/python-modules/vega_datasets { }; + + venusian = callPackage ../development/python-modules/venusian { }; + + verboselogs = callPackage ../development/python-modules/verboselogs { }; + versioneer = callPackage ../development/python-modules/versioneer { }; + versiontools = callPackage ../development/python-modules/versiontools { }; + + vertica-python = callPackage ../development/python-modules/vertica-python { }; + + veryprettytable = callPackage ../development/python-modules/veryprettytable { }; + + vidstab = callPackage ../development/python-modules/vidstab { }; + viewstate = callPackage ../development/python-modules/viewstate { }; vine = callPackage ../development/python-modules/vine { }; + virtkey = callPackage ../development/python-modules/virtkey { inherit (pkgs) pkgconfig; }; + + virtual-display = callPackage ../development/python-modules/virtual-display { }; + + virtualenv = callPackage ../development/python-modules/virtualenv { }; + + virtualenv-clone = callPackage ../development/python-modules/virtualenv-clone { }; + + virtualenvwrapper = callPackage ../development/python-modules/virtualenvwrapper { }; + visitor = callPackage ../development/python-modules/visitor { }; + vispy = callPackage ../development/python-modules/vispy { }; + + vmprof = callPackage ../development/python-modules/vmprof { }; + + vobject = callPackage ../development/python-modules/vobject { }; + + voluptuous = callPackage ../development/python-modules/voluptuous { }; + + voluptuous-serialize = callPackage ../development/python-modules/voluptuous-serialize { }; + + vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { }; + + vsts = callPackage ../development/python-modules/vsts { }; + + vsts-cd-manager = callPackage ../development/python-modules/vsts-cd-manager { }; + vtk = toPythonModule (pkgs.vtk_7.override { inherit (self) python; enablePython = true; }); - whitenoise = callPackage ../development/python-modules/whitenoise { }; + vultr = callPackage ../development/python-modules/vultr { }; - XlsxWriter = callPackage ../development/python-modules/XlsxWriter { }; + vulture = callPackage ../development/python-modules/vulture { }; - yowsup = callPackage ../development/python-modules/yowsup { }; + vxi11 = callPackage ../development/python-modules/vxi11 { }; - yubico-client = callPackage ../development/python-modules/yubico-client { }; + w3lib = callPackage ../development/python-modules/w3lib { }; - wptserve = callPackage ../development/python-modules/wptserve { }; + wadllib = callPackage ../development/python-modules/wadllib { }; - yenc = callPackage ../development/python-modules/yenc { }; + waitress = callPackage ../development/python-modules/waitress { }; - zeep = callPackage ../development/python-modules/zeep { }; + waitress-django = callPackage ../development/python-modules/waitress-django { }; - zeitgeist = disabledIf isPy3k - (toPythonModule (pkgs.zeitgeist.override{python2Packages=self;})).py; + wakeonlan = callPackage ../development/python-modules/wakeonlan { }; - zeroconf = callPackage ../development/python-modules/zeroconf { }; + Wand = callPackage ../development/python-modules/Wand { }; - zipfile36 = callPackage ../development/python-modules/zipfile36 { }; - - todoist = callPackage ../development/python-modules/todoist { }; - - zstd = callPackage ../development/python-modules/zstd { - inherit (pkgs) zstd pkgconfig; - }; - - zstandard = callPackage ../development/python-modules/zstandard { }; - - zxcvbn = callPackage ../development/python-modules/zxcvbn { }; - - incremental = callPackage ../development/python-modules/incremental { }; - - treq = callPackage ../development/python-modules/treq { }; - - snakeviz = callPackage ../development/python-modules/snakeviz { }; - - nitpick = callPackage ../applications/version-management/nitpick { }; - - pluginbase = callPackage ../development/python-modules/pluginbase { }; - - node-semver = callPackage ../development/python-modules/node-semver { }; - - diskcache = callPackage ../development/python-modules/diskcache { }; - - dissononce = callPackage ../development/python-modules/dissononce { }; - - distro = callPackage ../development/python-modules/distro { }; - - bz2file = callPackage ../development/python-modules/bz2file { }; - - smart_open = callPackage ../development/python-modules/smart_open { }; - - gensim = callPackage ../development/python-modules/gensim { }; - - genpy = callPackage ../development/python-modules/genpy { }; - - cymem = callPackage ../development/python-modules/cymem { }; - - ftfy = callPackage ../development/python-modules/ftfy { }; - - murmurhash = callPackage ../development/python-modules/murmurhash { }; - - pkuseg = callPackage ../development/python-modules/pkuseg { }; - - plac = callPackage ../development/python-modules/plac { }; - - preshed = callPackage ../development/python-modules/preshed { }; - - backports_weakref = callPackage ../development/python-modules/backports_weakref { }; - - blis = callPackage ../development/python-modules/blis { }; - - srsly = callPackage ../development/python-modules/srsly { }; - - thinc = callPackage ../development/python-modules/thinc { }; - - wasabi = callPackage ../development/python-modules/wasabi { }; - - yahooweather = callPackage ../development/python-modules/yahooweather { }; - - somajo = callPackage ../development/python-modules/somajo { }; - - spacy = callPackage ../development/python-modules/spacy { }; - - spacy_models = callPackage ../development/python-modules/spacy/models.nix { }; - - pyspark = callPackage ../development/python-modules/pyspark { }; - - pysensors = callPackage ../development/python-modules/pysensors { }; - - python-toolbox = callPackage ../development/python-modules/python-toolbox { }; - - pysnooper = callPackage ../development/python-modules/pysnooper { }; - - sseclient = callPackage ../development/python-modules/sseclient { }; + warlock = callPackage ../development/python-modules/warlock { }; warrant = callPackage ../development/python-modules/warrant { }; - textacy = callPackage ../development/python-modules/textacy { }; + wasabi = callPackage ../development/python-modules/wasabi { }; - tld = callPackage ../development/python-modules/tld { }; + watchdog = callPackage ../development/python-modules/watchdog { }; - tldextract = callPackage ../development/python-modules/tldextract { }; + WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { }; - transip = callPackage ../development/python-modules/transip { }; + wcwidth = callPackage ../development/python-modules/wcwidth { }; - pyemd = callPackage ../development/python-modules/pyemd { }; + weasyprint = callPackage ../development/python-modules/weasyprint { }; - openwrt-luci-rpc = disabledIf (!isPy3k) (callPackage ../development/python-modules/openwrt-luci-rpc { }); + webapp2 = callPackage ../development/python-modules/webapp2 { }; - pulp = callPackage ../development/python-modules/pulp { }; + webassets = callPackage ../development/python-modules/webassets { }; - pure-pcapy3 = callPackage ../development/python-modules/pure-pcapy3 { }; + web = callPackage ../development/python-modules/web { }; - cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { }; + webcolors = callPackage ../development/python-modules/webcolors { }; - behave = callPackage ../development/python-modules/behave { }; + webdavclient3 = callPackage ../development/python-modules/webdavclient3 { }; - bellows = callPackage ../development/python-modules/bellows { }; + webencodings = callPackage ../development/python-modules/webencodings { }; - pyhamcrest = if isPy3k then - callPackage ../development/python-modules/pyhamcrest { } - else - callPackage ../development/python-modules/pyhamcrest/1.nix { }; + webhelpers = callPackage ../development/python-modules/webhelpers { }; - pyhaversion = callPackage ../development/python-modules/pyhaversion { }; + webob = callPackage ../development/python-modules/webob { }; - parse = callPackage ../development/python-modules/parse { }; - - parse-type = callPackage ../development/python-modules/parse-type { }; - - ephem = callPackage ../development/python-modules/ephem { }; - - voluptuous = callPackage ../development/python-modules/voluptuous { }; - - voluptuous-serialize = callPackage ../development/python-modules/voluptuous-serialize { }; - - pysigset = callPackage ../development/python-modules/pysigset { }; - - us = callPackage ../development/python-modules/us { }; - - wsproto = if (pythonAtLeast "3.6") then - callPackage ../development/python-modules/wsproto { } - else - callPackage ../development/python-modules/wsproto/0.14.nix { }; - - h11 = callPackage ../development/python-modules/h11 { }; - - python-docx = callPackage ../development/python-modules/python-docx { }; - - python-doi = callPackage ../development/python-modules/python-doi { }; - - aiohue = callPackage ../development/python-modules/aiohue { }; - - PyMVGLive = callPackage ../development/python-modules/pymvglive { }; - - coinmarketcap = callPackage ../development/python-modules/coinmarketcap { }; - - pyowm = callPackage ../development/python-modules/pyowm { }; - - prometheus_client = callPackage ../development/python-modules/prometheus_client { }; - - pysdl2 = callPackage ../development/python-modules/pysdl2 { }; - - pyogg = callPackage ../development/python-modules/pyogg { }; - - rubymarshal = callPackage ../development/python-modules/rubymarshal { }; - - radio_beam = callPackage ../development/python-modules/radio_beam { }; - - spectral-cube = callPackage ../development/python-modules/spectral-cube { }; - - astunparse = callPackage ../development/python-modules/astunparse { }; - - gast = callPackage ../development/python-modules/gast { }; - - ibis = callPackage ../development/python-modules/ibis { }; - - ibis-framework = callPackage ../development/python-modules/ibis-framework { }; - - qiskit = callPackage ../development/python-modules/qiskit { }; - - qiskit-aer = callPackage ../development/python-modules/qiskit-aer { }; - - qiskit-aqua = callPackage ../development/python-modules/qiskit-aqua { }; - - qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { }; - - qiskit-ignis = callPackage ../development/python-modules/qiskit-ignis { }; - - qiskit-terra = callPackage ../development/python-modules/qiskit-terra { }; - - qasm2image = callPackage ../development/python-modules/qasm2image { }; - - simpy = callPackage ../development/python-modules/simpy { }; - - x256 = callPackage ../development/python-modules/x256 { }; - - yattag = callPackage ../development/python-modules/yattag { }; - - yfinance = callPackage ../development/python-modules/yfinance { }; - - xenomapper = disabledIf (!isPy3k) (callPackage ../applications/science/biology/xenomapper { }); - - z3 = (toPythonModule (pkgs.z3.override { - inherit python; - })).python; - - zeroc-ice = callPackage ../development/python-modules/zeroc-ice { }; - - zm-py = callPackage ../development/python-modules/zm-py { }; - - rfc7464 = callPackage ../development/python-modules/rfc7464 { }; - - foundationdb51 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb51; }; - foundationdb52 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb52; }; - foundationdb60 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb60; }; - foundationdb61 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb61; }; - - libtorrentRasterbar = (toPythonModule (pkgs.libtorrentRasterbar.override { - inherit python; - })).python; - - libiio = (toPythonModule (pkgs.libiio.override { - inherit python; - })).python; - - localzone = callPackage ../development/python-modules/localzone { }; - - scour = callPackage ../development/python-modules/scour { }; - - pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 - - nanoleaf = callPackage ../development/python-modules/nanoleaf { }; - - nanotime = callPackage ../development/python-modules/nanotime { }; - - importlib-metadata = callPackage ../development/python-modules/importlib-metadata {}; - - importlib-resources = callPackage ../development/python-modules/importlib-resources {}; - - srptools = callPackage ../development/python-modules/srptools { }; - - srp = callPackage ../development/python-modules/srp { }; - - curve25519-donna = callPackage ../development/python-modules/curve25519-donna { }; - - pyatv = callPackage ../development/python-modules/pyatv { }; - - pybotvac = callPackage ../development/python-modules/pybotvac { }; - - pymetno = callPackage ../development/python-modules/pymetno { }; - - pytado = callPackage ../development/python-modules/pytado { }; - - casttube = callPackage ../development/python-modules/casttube { }; - - lzstring = callPackage ../development/python-modules/lzstring { }; - - flickrapi = callPackage ../development/python-modules/flickrapi { }; - - aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { }; - - mwparserfromhell = callPackage ../development/python-modules/mwparserfromhell { }; - - starlette = callPackage ../development/python-modules/starlette { }; - - uvicorn = callPackage ../development/python-modules/uvicorn { }; - - pydantic = callPackage ../development/python-modules/pydantic { }; - - fastapi = callPackage ../development/python-modules/fastapi { }; - - stringcase = callPackage ../development/python-modules/stringcase { }; + weboob = callPackage ../development/python-modules/weboob { }; webrtcvad = callPackage ../development/python-modules/webrtcvad { }; - pykwalify = callPackage ../development/python-modules/pykwalify { }; + websocket_client = callPackage ../development/python-modules/websocket_client { }; + + websockets = callPackage ../development/python-modules/websockets { }; + + websockify = callPackage ../development/python-modules/websockify { }; + + webtest = callPackage ../development/python-modules/webtest { }; + + werkzeug = callPackage ../development/python-modules/werkzeug { }; west = callPackage ../development/python-modules/west { }; @@ -7844,21 +7361,304 @@ in { wget = callPackage ../development/python-modules/wget { }; - runway-python = callPackage ../development/python-modules/runway-python { }; + wheel = callPackage ../development/python-modules/wheel { }; - pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { }; + whichcraft = callPackage ../development/python-modules/whichcraft { }; - hcloud = callPackage ../development/python-modules/hcloud { }; + whisper = callPackage ../development/python-modules/whisper { }; - managesieve = callPackage ../development/python-modules/managesieve { }; + whitenoise = callPackage ../development/python-modules/whitenoise { }; - pony = callPackage ../development/python-modules/pony { }; + whoosh = callPackage ../development/python-modules/whoosh { }; - rxv = callPackage ../development/python-modules/rxv { }; + widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; - userpath = callPackage ../development/python-modules/userpath { }; + willow = callPackage ../development/python-modules/willow { }; - pooch = callPackage ../development/python-modules/pooch {}; + word2vec = callPackage ../development/python-modules/word2vec { }; + + wordcloud = callPackage ../development/python-modules/wordcloud { }; + + wordfreq = callPackage ../development/python-modules/wordfreq { }; + + worldengine = callPackage ../development/python-modules/worldengine { }; + + wptserve = callPackage ../development/python-modules/wptserve { }; + + wrapt = callPackage ../development/python-modules/wrapt { }; + + wrf-python = callPackage ../development/python-modules/wrf-python { }; + + ws4py = callPackage ../development/python-modules/ws4py { }; + + wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { }; + + WSGIProxy = callPackage ../development/python-modules/wsgiproxy { }; + + wsgitools = callPackage ../development/python-modules/wsgitools { }; + + WSME = callPackage ../development/python-modules/WSME { }; + + wsproto = if (pythonAtLeast "3.6") then + callPackage ../development/python-modules/wsproto { } + else + callPackage ../development/python-modules/wsproto/0.14.nix { }; + + wtforms = callPackage ../development/python-modules/wtforms { }; + + wtf-peewee = callPackage ../development/python-modules/wtf-peewee { }; + + wurlitzer = callPackage ../development/python-modules/wurlitzer { }; + + wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { + wxGTK = pkgs.wxGTK30; + inherit (pkgs) pkgconfig; + }; + + wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { + inherit (pkgs) pkgconfig; + wxGTK = pkgs.wxGTK30.override { + withGtk2 = false; + withWebKit = true; + }; + }; + + wxPython = self.wxPython30; + + x11_hash = callPackage ../development/python-modules/x11_hash { }; + + x256 = callPackage ../development/python-modules/x256 { }; + + xapian = callPackage ../development/python-modules/xapian { xapian = pkgs.xapian; }; + + xapp = callPackage ../development/python-modules/xapp { + inherit (pkgs) gtk3 gobject-introspection polkit; + inherit (pkgs.cinnamon) xapps; + }; + + xarray = callPackage ../development/python-modules/xarray { }; + + xattr = callPackage ../development/python-modules/xattr { }; + + xcaplib = callPackage ../development/python-modules/xcaplib { }; + + xcffib = callPackage ../development/python-modules/xcffib { }; + + xdg = callPackage ../development/python-modules/xdg { }; + + xdis = callPackage ../development/python-modules/xdis { }; + + xdot = callPackage ../development/python-modules/xdot { }; + + xenomapper = disabledIf (!isPy3k) (callPackage ../applications/science/biology/xenomapper { }); + + xgboost = callPackage ../development/python-modules/xgboost { xgboost = pkgs.xgboost; }; + + xhtml2pdf = callPackage ../development/python-modules/xhtml2pdf { }; + + xkcdpass = callPackage ../development/python-modules/xkcdpass { }; + + xlib = callPackage ../development/python-modules/xlib { }; + + xlrd = callPackage ../development/python-modules/xlrd { }; + + xlsx2csv = callPackage ../development/python-modules/xlsx2csv { }; + + XlsxWriter = callPackage ../development/python-modules/XlsxWriter { }; + + xlwt = callPackage ../development/python-modules/xlwt { }; + + xml2rfc = callPackage ../development/python-modules/xml2rfc { }; + + xmlschema = callPackage ../development/python-modules/xmlschema { }; + + xmltodict = callPackage ../development/python-modules/xmltodict { }; + + xmodem = callPackage ../development/python-modules/xmodem { }; + + xmpppy = callPackage ../development/python-modules/xmpppy { }; + + xnd = callPackage ../development/python-modules/xnd { }; + + xpybutil = callPackage ../development/python-modules/xpybutil { }; + + xstatic-bootbox = callPackage ../development/python-modules/xstatic-bootbox { }; + + xstatic-bootstrap = callPackage ../development/python-modules/xstatic-bootstrap { }; + + xstatic = callPackage ../development/python-modules/xstatic { }; + + xstatic-jquery = callPackage ../development/python-modules/xstatic-jquery { }; + + xstatic-jquery-file-upload = callPackage ../development/python-modules/xstatic-jquery-file-upload { }; + + xstatic-jquery-ui = callPackage ../development/python-modules/xstatic-jquery-ui { }; + + xstatic-pygments = callPackage ../development/python-modules/xstatic-pygments { }; + + xvfbwrapper = callPackage ../development/python-modules/xvfbwrapper { inherit (pkgs.xorg) xorgserver; }; + + xxhash = callPackage ../development/python-modules/xxhash { }; + + yahooweather = callPackage ../development/python-modules/yahooweather { }; + + yamllint = callPackage ../development/python-modules/yamllint { }; + + yanc = callPackage ../development/python-modules/yanc { }; + + yapf = callPackage ../development/python-modules/yapf { }; + + yappi = callPackage ../development/python-modules/yappi { }; + + Yapsy = callPackage ../development/python-modules/yapsy { }; + + yarg = callPackage ../development/python-modules/yarg { }; + + yarl = callPackage ../development/python-modules/yarl { }; + + yattag = callPackage ../development/python-modules/yattag { }; + + ydiff = callPackage ../development/python-modules/ydiff { }; + + yenc = callPackage ../development/python-modules/yenc { }; + + yfinance = callPackage ../development/python-modules/yfinance { }; + + yoda = toPythonModule (pkgs.yoda.override { inherit python; }); + + youtube-dl = callPackage ../tools/misc/youtube-dl { }; + + youtube-dl-light = callPackage ../tools/misc/youtube-dl { + ffmpegSupport = false; + phantomjsSupport = false; + }; + + yowsup = callPackage ../development/python-modules/yowsup { }; + + yt = callPackage ../development/python-modules/yt { }; + + yubico-client = callPackage ../development/python-modules/yubico-client { }; + + z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { }; + + z3 = (toPythonModule (pkgs.z3.override { inherit python; })).python; + + zake = callPackage ../development/python-modules/zake { }; + + zarr = callPackage ../development/python-modules/zarr { }; + + zbase32 = callPackage ../development/python-modules/zbase32 { }; + + zc_buildout221 = callPackage ../development/python-modules/buildout { }; + + zc_buildout = self.zc_buildout221; # A patched version of buildout, useful for buildout based development on Nix + + zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; + + zc_lockfile = callPackage ../development/python-modules/zc_lockfile { }; + + zconfig = callPackage ../development/python-modules/zconfig { }; + + zdaemon = callPackage ../development/python-modules/zdaemon { }; + + zeep = callPackage ../development/python-modules/zeep { }; + + zeitgeist = disabledIf isPy3k (toPythonModule (pkgs.zeitgeist.override { python2Packages = self; })).py; + + zerobin = callPackage ../development/python-modules/zerobin { }; + + zeroc-ice = callPackage ../development/python-modules/zeroc-ice { }; + + zeroconf = callPackage ../development/python-modules/zeroconf { }; + + zerorpc = callPackage ../development/python-modules/zerorpc { }; + + zetup = callPackage ../development/python-modules/zetup { }; + + zfec = callPackage ../development/python-modules/zfec { }; + + zha-quirks = callPackage ../development/python-modules/zha-quirks { }; + + zict = callPackage ../development/python-modules/zict { }; + + zigpy = callPackage ../development/python-modules/zigpy { }; + + zigpy-cc = callPackage ../development/python-modules/zigpy-cc { }; + + zigpy-deconz = callPackage ../development/python-modules/zigpy-deconz { }; + + zigpy-xbee = callPackage ../development/python-modules/zigpy-xbee { }; + + zigpy-zigate = callPackage ../development/python-modules/zigpy-zigate { }; + + zimports = callPackage ../development/python-modules/zimports { }; + + zipfile36 = callPackage ../development/python-modules/zipfile36 { }; + + zipp = if pythonOlder "3.6" then + callPackage ../development/python-modules/zipp/1.nix { } + else + callPackage ../development/python-modules/zipp { }; + + zipstream = callPackage ../development/python-modules/zipstream { }; + + zm-py = callPackage ../development/python-modules/zm-py { }; + + zodb = callPackage ../development/python-modules/zodb { }; + + zodbpickle = callPackage ../development/python-modules/zodbpickle { }; + + zope_broken = callPackage ../development/python-modules/zope_broken { }; + + zope_component = callPackage ../development/python-modules/zope_component { }; + + zope_configuration = callPackage ../development/python-modules/zope_configuration { }; + + zope_contenttype = callPackage ../development/python-modules/zope_contenttype { }; + + zope_copy = callPackage ../development/python-modules/zope_copy { }; + + zope-deferredimport = callPackage ../development/python-modules/zope-deferredimport { }; + + zope_deprecation = callPackage ../development/python-modules/zope_deprecation { }; + + zope_dottedname = callPackage ../development/python-modules/zope_dottedname { }; + + zope_event = callPackage ../development/python-modules/zope_event { }; + + zope_exceptions = callPackage ../development/python-modules/zope_exceptions { }; + + zope_filerepresentation = callPackage ../development/python-modules/zope_filerepresentation { }; + + zope-hookable = callPackage ../development/python-modules/zope-hookable { }; + + zope_i18n = callPackage ../development/python-modules/zope_i18n { }; + + zope_i18nmessageid = callPackage ../development/python-modules/zope_i18nmessageid { }; + + zope_interface = callPackage ../development/python-modules/zope_interface { }; + + zope_lifecycleevent = callPackage ../development/python-modules/zope_lifecycleevent { }; + + zope_location = callPackage ../development/python-modules/zope_location { }; + + zope_proxy = callPackage ../development/python-modules/zope_proxy { }; + + zope_schema = callPackage ../development/python-modules/zope_schema { }; + + zope_size = callPackage ../development/python-modules/zope_size { }; + + zope_testing = callPackage ../development/python-modules/zope_testing { }; + + zope_testrunner = callPackage ../development/python-modules/zope_testrunner { }; + + zopfli = callPackage ../development/python-modules/zopfli { }; + + zstandard = callPackage ../development/python-modules/zstandard { }; + + zstd = callPackage ../development/python-modules/zstd { inherit (pkgs) zstd pkgconfig; }; + + zxcvbn = callPackage ../development/python-modules/zxcvbn { }; });