From 770aeb38c873bee43070ca2805abd735570212fe Mon Sep 17 00:00:00 2001 From: FKouhai Date: Wed, 5 Mar 2025 19:22:18 +0100 Subject: [PATCH 01/66] ecspresso: init at 2.4.6 --- pkgs/by-name/ec/ecspresso/package.nix | 49 +++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/ec/ecspresso/package.nix diff --git a/pkgs/by-name/ec/ecspresso/package.nix b/pkgs/by-name/ec/ecspresso/package.nix new file mode 100644 index 000000000000..ef5db5c4455e --- /dev/null +++ b/pkgs/by-name/ec/ecspresso/package.nix @@ -0,0 +1,49 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, +}: + +buildGoModule rec { + pname = "ecspresso"; + version = "2.4.6"; + + src = fetchFromGitHub { + owner = "kayac"; + repo = "ecspresso"; + tag = "v${version}"; + hash = "sha256-tpTtGU0tqBuRu61jtEdK+/JbJsWdVEks1iKCsne9sQQ="; + }; + + subPackages = [ + "cmd/ecspresso" + ]; + + vendorHash = "sha256-P5qx6rNFzyKA4L/bAIsdzL1McGkeRF/5ah0gRx1lBZk="; + + ldflags = [ + "-s" + "-w" + "-X main.buildDate=none" + "-X main.Version=${version}" + ]; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + versionCheckProgramArg = "version"; + + meta = { + description = "Deployment tool for ECS"; + mainProgram = "ecspresso"; + license = lib.licenses.mit; + homepage = "https://github.com/kayac/ecspresso/"; + maintainers = with lib.maintainers; [ + FKouhai + ]; + }; +} From a1dfaf51e2400f4698bbd076c56473b0ba6303bf Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 17 Mar 2025 17:27:59 +0000 Subject: [PATCH 02/66] nixos/test-driver: integrate Python `unittest` assertions Replaces / Closes #345948 I tried to integrate `pytest` assertions because I like the reporting, but I only managed to get the very basic thing and even that was messing around a lot with its internals. The approach in #345948 shifts too much maintenance effort to us, so it's not really desirable either. After discussing with Benoit on Ocean Sprint about this, we decided that it's probably the best compromise to integrate `unittest`: it also provides good diffs when needed, but the downside is that existing tests don't benefit from it. This patch essentially does the following things: * Add a new global `t` that is an instance of a `unittest.TestCase` class. I decided to just go for `t` given that e.g. `tester.assertEqual` (or any other longer name) seems quite verbose. * Use a special class for errors that get special treatment: * The traceback is minimized to only include frames from the testScript: in this case I don't really care about anything else and IMHO that's just visual noise. This is not the case for other exceptions since these may indicate a bug and then people should be able to send the full traceback to the maintainers. * Display the error, but with `!!!` as prefix to make sure it's easier to spot in between other logs. This looks e.g. like !!! Traceback (most recent call last): !!! File "", line 7, in !!! foo() !!! File "", line 5, in foo !!! t.assertEqual({"foo":[1,2,{"foo":"bar"}]},{"foo":[1,2,{"bar":"foo"}],"bar":[1,2,3,4,"foo"]}) !!! !!! NixOSAssertionError: {'foo': [1, 2, {'foo': 'bar'}]} != {'foo': [1, 2, {'bar': 'foo'}], 'bar': [1, 2, 3, 4, 'foo']} !!! - {'foo': [1, 2, {'foo': 'bar'}]} !!! + {'bar': [1, 2, 3, 4, 'foo'], 'foo': [1, 2, {'bar': 'foo'}]} cleanup kill machine (pid 9) qemu-system-x86_64: terminating on signal 15 from pid 6 (/nix/store/wz0j2zi02rvnjiz37nn28h3gfdq61svz-python3-3.12.9/bin/python3.12) kill vlan (pid 7) (finished: cleanup, in 0.00 seconds) Co-authored-by: bew --- .../writing-nixos-tests.section.md | 5 ++- .../lib/test-driver/src/test_driver/driver.py | 38 ++++++++++++++++++- .../lib/test-driver/src/test_driver/logger.py | 19 ++++++++++ nixos/lib/test-script-prepend.py | 2 + 4 files changed, 61 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/development/writing-nixos-tests.section.md b/nixos/doc/manual/development/writing-nixos-tests.section.md index bd588e2ba80b..5b08975e5ea4 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.section.md +++ b/nixos/doc/manual/development/writing-nixos-tests.section.md @@ -121,8 +121,7 @@ and checks that the output is more-or-less correct: ```py machine.start() machine.wait_for_unit("default.target") -if not "Linux" in machine.succeed("uname"): - raise Exception("Wrong OS") +t.assertIn("Linux", machine.succeed("uname"), "Wrong OS") ``` The first line is technically unnecessary; machines are implicitly started @@ -134,6 +133,8 @@ starting them in parallel: start_all() ``` +Under the variable `t`, all assertions from [`unittest.TestCase`](https://docs.python.org/3/library/unittest.html) are available. + If the hostname of a node contains characters that can't be used in a Python variable name, those characters will be replaced with underscores in the variable name, so `nodes.machine-a` will be exposed diff --git a/nixos/lib/test-driver/src/test_driver/driver.py b/nixos/lib/test-driver/src/test_driver/driver.py index 6061c1bc09b8..8a878e9a7558 100644 --- a/nixos/lib/test-driver/src/test_driver/driver.py +++ b/nixos/lib/test-driver/src/test_driver/driver.py @@ -1,12 +1,15 @@ import os import re import signal +import sys import tempfile import threading +import traceback from collections.abc import Callable, Iterator from contextlib import AbstractContextManager, contextmanager from pathlib import Path from typing import Any +from unittest import TestCase from test_driver.logger import AbstractLogger from test_driver.machine import Machine, NixStartScript, retry @@ -38,6 +41,14 @@ def pythonize_name(name: str) -> str: return re.sub(r"^[^A-z_]|[^A-z0-9_]", "_", name) +class NixOSAssertionError(AssertionError): + pass + + +class Tester(TestCase): + failureException = NixOSAssertionError + + class Driver: """A handle to the driver that sets up the environment and runs the tests""" @@ -140,6 +151,7 @@ class Driver: serial_stdout_on=self.serial_stdout_on, polling_condition=self.polling_condition, Machine=Machine, # for typing + t=Tester(), ) machine_symbols = {pythonize_name(m.name): m for m in self.machines} # If there's exactly one machine, make it available under the name @@ -163,7 +175,31 @@ class Driver: """Run the test script""" with self.logger.nested("run the VM test script"): symbols = self.test_symbols() # call eagerly - exec(self.tests, symbols, None) + try: + exec(self.tests, symbols, None) + except NixOSAssertionError: + exc_type, exc, tb = sys.exc_info() + filtered = [ + frame + for frame in traceback.extract_tb(tb) + if frame.filename == "" + ] + + self.logger.log_test_error("Traceback (most recent call last):") + code = self.tests.splitlines() + for frame, line in zip(filtered, traceback.format_list(filtered)): + self.logger.log_test_error(line.rstrip()) + if lineno := frame.lineno: + self.logger.log_test_error( + f" {code[lineno - 1].strip()}", + ) + + self.logger.log_test_error("") # blank line for readability + exc_prefix = exc_type.__name__ if exc_type is not None else "Error" + for line in f"{exc_prefix}: {exc}".splitlines(): + self.logger.log_test_error(line) + + sys.exit(1) def run_tests(self) -> None: """Run the test script (for non-interactive test runs)""" diff --git a/nixos/lib/test-driver/src/test_driver/logger.py b/nixos/lib/test-driver/src/test_driver/logger.py index 564d39f4f055..fa195080fa2b 100644 --- a/nixos/lib/test-driver/src/test_driver/logger.py +++ b/nixos/lib/test-driver/src/test_driver/logger.py @@ -44,6 +44,10 @@ class AbstractLogger(ABC): def error(self, *args, **kwargs) -> None: # type: ignore pass + @abstractmethod + def log_test_error(self, *args, **kwargs) -> None: # type:ignore + pass + @abstractmethod def log_serial(self, message: str, machine: str) -> None: pass @@ -97,6 +101,9 @@ class JunitXMLLogger(AbstractLogger): self.tests[self.currentSubtest].stderr += args[0] + os.linesep self.tests[self.currentSubtest].failure = True + def log_test_error(self, *args, **kwargs) -> None: # type: ignore + self.error(*args, **kwargs) + def log_serial(self, message: str, machine: str) -> None: if not self._print_serial_logs: return @@ -156,6 +163,10 @@ class CompositeLogger(AbstractLogger): for logger in self.logger_list: logger.warning(*args, **kwargs) + def log_test_error(self, *args, **kwargs) -> None: # type: ignore + for logger in self.logger_list: + logger.log_test_error(*args, **kwargs) + def error(self, *args, **kwargs) -> None: # type: ignore for logger in self.logger_list: logger.error(*args, **kwargs) @@ -222,6 +233,11 @@ class TerminalLogger(AbstractLogger): self._eprint(Style.DIM + f"{machine} # {message}" + Style.RESET_ALL) + def log_test_error(self, *args, **kwargs) -> None: # type: ignore + prefix = Fore.RED + "!!! " + Style.RESET_ALL + # NOTE: using `warning` instead of `error` to ensure it does not exit after printing the first log + self.warning(f"{prefix}{args[0]}", *args[1:], **kwargs) + class XMLLogger(AbstractLogger): def __init__(self, outfile: str) -> None: @@ -261,6 +277,9 @@ class XMLLogger(AbstractLogger): def error(self, *args, **kwargs) -> None: # type: ignore self.log(*args, **kwargs) + def log_test_error(self, *args, **kwargs) -> None: # type: ignore + self.log(*args, **kwargs) + def log(self, message: str, attributes: dict[str, str] = {}) -> None: self.drain_log_queue() self.log_line(message, attributes) diff --git a/nixos/lib/test-script-prepend.py b/nixos/lib/test-script-prepend.py index 9d2efdf97303..31dad14ef8dd 100644 --- a/nixos/lib/test-script-prepend.py +++ b/nixos/lib/test-script-prepend.py @@ -8,6 +8,7 @@ from test_driver.logger import AbstractLogger from typing import Callable, Iterator, ContextManager, Optional, List, Dict, Any, Union from typing_extensions import Protocol from pathlib import Path +from unittest import TestCase class RetryProtocol(Protocol): @@ -51,3 +52,4 @@ join_all: Callable[[], None] serial_stdout_off: Callable[[], None] serial_stdout_on: Callable[[], None] polling_condition: PollingConditionProtocol +t: TestCase From 11ff96a6795889a3d59b2ec0e9d587b9cf15ed5c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 18 Mar 2025 11:02:47 +0000 Subject: [PATCH 03/66] nixos/test-driver: use RequestedAssertionFailed/TestScriptError in Machine class I think it's reasonable to also have this kind of visual distinction here between test failures and actual errors from the test framework. A failing `machine.require_unit_state` now lookgs like this for instance: !!! Traceback (most recent call last): !!! File "", line 3, in !!! machine.require_unit_state("postgresql","active") !!! !!! RequestedAssertionFailed: Expected unit 'postgresql' to to be in state 'active' but it is in state 'inactive' Co-authored-by: Benoit de Chezelles --- nixos/lib/test-driver/src/pyproject.toml | 2 +- .../lib/test-driver/src/test_driver/driver.py | 34 +++++++++++-------- .../lib/test-driver/src/test_driver/errors.py | 23 +++++++++++++ .../test-driver/src/test_driver/machine.py | 31 ++++++++++------- 4 files changed, 62 insertions(+), 28 deletions(-) create mode 100644 nixos/lib/test-driver/src/test_driver/errors.py diff --git a/nixos/lib/test-driver/src/pyproject.toml b/nixos/lib/test-driver/src/pyproject.toml index ac83eed268d9..fa4e6a2de127 100644 --- a/nixos/lib/test-driver/src/pyproject.toml +++ b/nixos/lib/test-driver/src/pyproject.toml @@ -21,7 +21,7 @@ target-version = "py312" line-length = 88 lint.select = ["E", "F", "I", "U", "N"] -lint.ignore = ["E501"] +lint.ignore = ["E501", "N818"] # xxx: we can import https://pypi.org/project/types-colorama/ here [[tool.mypy.overrides]] diff --git a/nixos/lib/test-driver/src/test_driver/driver.py b/nixos/lib/test-driver/src/test_driver/driver.py index 8a878e9a7558..6837a0f694dc 100644 --- a/nixos/lib/test-driver/src/test_driver/driver.py +++ b/nixos/lib/test-driver/src/test_driver/driver.py @@ -11,6 +11,7 @@ from pathlib import Path from typing import Any from unittest import TestCase +from test_driver.errors import RequestedAssertionFailed, TestScriptError from test_driver.logger import AbstractLogger from test_driver.machine import Machine, NixStartScript, retry from test_driver.polling_condition import PollingCondition @@ -19,6 +20,18 @@ from test_driver.vlan import VLan SENTINEL = object() +class AssertionTester(TestCase): + """ + Subclass of `unittest.TestCase` which is used in the + `testScript` to perform assertions. + + It throws a custom exception whose parent class + gets special treatment in the logs. + """ + + failureException = RequestedAssertionFailed + + def get_tmp_dir() -> Path: """Returns a temporary directory that is defined by TMPDIR, TEMP, TMP or CWD Raises an exception in case the retrieved temporary directory is not writeable @@ -41,14 +54,6 @@ def pythonize_name(name: str) -> str: return re.sub(r"^[^A-z_]|[^A-z0-9_]", "_", name) -class NixOSAssertionError(AssertionError): - pass - - -class Tester(TestCase): - failureException = NixOSAssertionError - - class Driver: """A handle to the driver that sets up the environment and runs the tests""" @@ -126,7 +131,7 @@ class Driver: try: yield except Exception as e: - self.logger.error(f'Test "{name}" failed with error: "{e}"') + self.logger.log_test_error(f'Test "{name}" failed with error: "{e}"') raise e def test_symbols(self) -> dict[str, Any]: @@ -151,7 +156,7 @@ class Driver: serial_stdout_on=self.serial_stdout_on, polling_condition=self.polling_condition, Machine=Machine, # for typing - t=Tester(), + t=AssertionTester(), ) machine_symbols = {pythonize_name(m.name): m for m in self.machines} # If there's exactly one machine, make it available under the name @@ -177,7 +182,7 @@ class Driver: symbols = self.test_symbols() # call eagerly try: exec(self.tests, symbols, None) - except NixOSAssertionError: + except TestScriptError: exc_type, exc, tb = sys.exc_info() filtered = [ frame @@ -186,15 +191,14 @@ class Driver: ] self.logger.log_test_error("Traceback (most recent call last):") + code = self.tests.splitlines() for frame, line in zip(filtered, traceback.format_list(filtered)): self.logger.log_test_error(line.rstrip()) if lineno := frame.lineno: - self.logger.log_test_error( - f" {code[lineno - 1].strip()}", - ) + self.logger.log_test_error(f" {code[lineno - 1].strip()}") - self.logger.log_test_error("") # blank line for readability + self.logger.log_test_error("") # blank line for readability exc_prefix = exc_type.__name__ if exc_type is not None else "Error" for line in f"{exc_prefix}: {exc}".splitlines(): self.logger.log_test_error(line) diff --git a/nixos/lib/test-driver/src/test_driver/errors.py b/nixos/lib/test-driver/src/test_driver/errors.py new file mode 100644 index 000000000000..0b52151d5c2c --- /dev/null +++ b/nixos/lib/test-driver/src/test_driver/errors.py @@ -0,0 +1,23 @@ +class TestScriptError(Exception): + """ + The base error class to indicate that the test script failed. + This (and its subclasses) get special treatment, i.e. only stack + frames from `testScript` are printed and the error gets prefixed + with `!!!` to make it easier to spot between other log-lines. + + This class is used for errors that aren't an actual test failure, + but also not a bug in the driver, e.g. failing OCR. + """ + + +class RequestedAssertionFailed(TestScriptError): + """ + Subclass of `TestScriptError` that gets special treatment. + + Exception raised when a requested assertion fails, + e.g. `machine.succeed(...)` or `t.assertEqual(...)`. + + This is separate from the base error class, to have a dedicated class name + that better represents this kind of failures. + (better readability in test output) + """ diff --git a/nixos/lib/test-driver/src/test_driver/machine.py b/nixos/lib/test-driver/src/test_driver/machine.py index 4faa37726508..1a1d2075973f 100644 --- a/nixos/lib/test-driver/src/test_driver/machine.py +++ b/nixos/lib/test-driver/src/test_driver/machine.py @@ -18,6 +18,7 @@ from pathlib import Path from queue import Queue from typing import Any +from test_driver.errors import RequestedAssertionFailed, TestScriptError from test_driver.logger import AbstractLogger from .qmp import QMPSession @@ -128,7 +129,7 @@ def _preprocess_screenshot(screenshot_path: str, negate: bool = False) -> str: ) if ret.returncode != 0: - raise Exception( + raise TestScriptError( f"Image processing failed with exit code {ret.returncode}, stdout: {ret.stdout.decode()}, stderr: {ret.stderr.decode()}" ) @@ -139,7 +140,7 @@ def _perform_ocr_on_screenshot( screenshot_path: str, model_ids: Iterable[int] ) -> list[str]: if shutil.which("tesseract") is None: - raise Exception("OCR requested but enableOCR is false") + raise TestScriptError("OCR requested but enableOCR is false") processed_image = _preprocess_screenshot(screenshot_path, negate=False) processed_negative = _preprocess_screenshot(screenshot_path, negate=True) @@ -162,7 +163,7 @@ def _perform_ocr_on_screenshot( capture_output=True, ) if ret.returncode != 0: - raise Exception(f"OCR failed with exit code {ret.returncode}") + raise TestScriptError(f"OCR failed with exit code {ret.returncode}") model_results.append(ret.stdout.decode("utf-8")) return model_results @@ -179,7 +180,9 @@ def retry(fn: Callable, timeout: int = 900) -> None: time.sleep(1) if not fn(True): - raise Exception(f"action timed out after {timeout} seconds") + raise RequestedAssertionFailed( + f"action timed out after {timeout} tries with one-second pause in-between" + ) class StartCommand: @@ -402,14 +405,14 @@ class Machine: def check_active(_last_try: bool) -> bool: state = self.get_unit_property(unit, "ActiveState", user) if state == "failed": - raise Exception(f'unit "{unit}" reached state "{state}"') + raise RequestedAssertionFailed(f'unit "{unit}" reached state "{state}"') if state == "inactive": status, jobs = self.systemctl("list-jobs --full 2>&1", user) if "No jobs" in jobs: info = self.get_unit_info(unit, user) if info["ActiveState"] == state: - raise Exception( + raise RequestedAssertionFailed( f'unit "{unit}" is inactive and there are no pending jobs' ) @@ -424,7 +427,7 @@ class Machine: def get_unit_info(self, unit: str, user: str | None = None) -> dict[str, str]: status, lines = self.systemctl(f'--no-pager show "{unit}"', user) if status != 0: - raise Exception( + raise RequestedAssertionFailed( f'retrieving systemctl info for unit "{unit}"' + ("" if user is None else f' under user "{user}"') + f" failed with exit code {status}" @@ -454,7 +457,7 @@ class Machine: user, ) if status != 0: - raise Exception( + raise RequestedAssertionFailed( f'retrieving systemctl property "{property}" for unit "{unit}"' + ("" if user is None else f' under user "{user}"') + f" failed with exit code {status}" @@ -502,7 +505,7 @@ class Machine: info = self.get_unit_info(unit) state = info["ActiveState"] if state != require_state: - raise Exception( + raise RequestedAssertionFailed( f"Expected unit '{unit}' to to be in state " f"'{require_state}' but it is in state '{state}'" ) @@ -656,7 +659,9 @@ class Machine: (status, out) = self.execute(command, timeout=timeout) if status != 0: self.log(f"output: {out}") - raise Exception(f"command `{command}` failed (exit code {status})") + raise RequestedAssertionFailed( + f"command `{command}` failed (exit code {status})" + ) output += out return output @@ -670,7 +675,9 @@ class Machine: with self.nested(f"must fail: {command}"): (status, out) = self.execute(command, timeout=timeout) if status == 0: - raise Exception(f"command `{command}` unexpectedly succeeded") + raise RequestedAssertionFailed( + f"command `{command}` unexpectedly succeeded" + ) output += out return output @@ -915,7 +922,7 @@ class Machine: ret = subprocess.run(f"pnmtopng '{tmp}' > '{filename}'", shell=True) os.unlink(tmp) if ret.returncode != 0: - raise Exception("Cannot convert screenshot") + raise TestScriptError("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 From cc3d409adca4d8479faf64b2d9cfd67d523a56ec Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 20 Mar 2025 12:39:53 +0000 Subject: [PATCH 04/66] nixos/test-driver: log associated machine for `self.nested` When doing `machine.succeed(...)` or something similar, it's now clear that the command `...` was issued on `machine`. Essentially, this results in the following diff in the log: -(finished: waiting for unit default.target, in 13.47 seconds) +machine: (finished: waiting for unit default.target, in 13.47 seconds) (finished: subtest: foobar text lorem ipsum, in 13.47 seconds) --- nixos/lib/test-driver/src/test_driver/logger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/test-driver/src/test_driver/logger.py b/nixos/lib/test-driver/src/test_driver/logger.py index fa195080fa2b..a218d234fe3f 100644 --- a/nixos/lib/test-driver/src/test_driver/logger.py +++ b/nixos/lib/test-driver/src/test_driver/logger.py @@ -213,7 +213,7 @@ class TerminalLogger(AbstractLogger): tic = time.time() yield toc = time.time() - self.log(f"(finished: {message}, in {toc - tic:.2f} seconds)") + self.log(f"(finished: {message}, in {toc - tic:.2f} seconds)", attributes) def info(self, *args, **kwargs) -> None: # type: ignore self.log(*args, **kwargs) From d587d569e0d6bb4c8dbdb6ddbd6e8e0d8c97bbd7 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 21 Mar 2025 11:38:01 +0000 Subject: [PATCH 05/66] nixos/test-driver: restructure error classes After a discussion with tfc, we agreed that we need a distinction between errors where the user isn't at fault (e.g. OCR failing - now called `MachineError`) and errors where the test actually failed (now called `RequestedAssertionFailed`). Both get special treatment from the error handler, i.e. a `!!!` prefix to make it easier to spot visually. However, only `RequestedAssertionFailed` gets the shortening of the traceback, `MachineError` exceptions may be something to report and maintainers usually want to see the full trace. Suggested-by: Jacek Galowicz --- .../lib/test-driver/src/test_driver/driver.py | 8 ++++-- .../lib/test-driver/src/test_driver/errors.py | 27 +++++++++---------- .../test-driver/src/test_driver/machine.py | 10 +++---- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/nixos/lib/test-driver/src/test_driver/driver.py b/nixos/lib/test-driver/src/test_driver/driver.py index 6837a0f694dc..56f29ffe24f1 100644 --- a/nixos/lib/test-driver/src/test_driver/driver.py +++ b/nixos/lib/test-driver/src/test_driver/driver.py @@ -11,7 +11,7 @@ from pathlib import Path from typing import Any from unittest import TestCase -from test_driver.errors import RequestedAssertionFailed, TestScriptError +from test_driver.errors import MachineError, RequestedAssertionFailed from test_driver.logger import AbstractLogger from test_driver.machine import Machine, NixStartScript, retry from test_driver.polling_condition import PollingCondition @@ -182,7 +182,11 @@ class Driver: symbols = self.test_symbols() # call eagerly try: exec(self.tests, symbols, None) - except TestScriptError: + except MachineError: + for line in traceback.format_exc().splitlines(): + self.logger.log_test_error(line) + sys.exit(1) + except RequestedAssertionFailed: exc_type, exc, tb = sys.exc_info() filtered = [ frame diff --git a/nixos/lib/test-driver/src/test_driver/errors.py b/nixos/lib/test-driver/src/test_driver/errors.py index 0b52151d5c2c..449fef0d30c7 100644 --- a/nixos/lib/test-driver/src/test_driver/errors.py +++ b/nixos/lib/test-driver/src/test_driver/errors.py @@ -1,23 +1,20 @@ -class TestScriptError(Exception): +class MachineError(Exception): """ - The base error class to indicate that the test script failed. - This (and its subclasses) get special treatment, i.e. only stack - frames from `testScript` are printed and the error gets prefixed - with `!!!` to make it easier to spot between other log-lines. + Exception that indicates an error that is NOT the user's fault, + i.e. something went wrong without the test being necessarily invalid, + such as failing OCR. - This class is used for errors that aren't an actual test failure, - but also not a bug in the driver, e.g. failing OCR. + To make it easier to spot, this exception (and its subclasses) + get a `!!!` prefix in the log output. """ -class RequestedAssertionFailed(TestScriptError): +class RequestedAssertionFailed(AssertionError): """ - Subclass of `TestScriptError` that gets special treatment. + Special assertion that gets thrown on an assertion error, + e.g. a failing `t.assertEqual(...)` or `machine.succeed(...)`. - Exception raised when a requested assertion fails, - e.g. `machine.succeed(...)` or `t.assertEqual(...)`. - - This is separate from the base error class, to have a dedicated class name - that better represents this kind of failures. - (better readability in test output) + This gets special treatment in error reporting: i.e. it gets + `!!!` as prefix just as `MachineError`, but all stack frames that are + not from `testScript` also get removed. """ diff --git a/nixos/lib/test-driver/src/test_driver/machine.py b/nixos/lib/test-driver/src/test_driver/machine.py index 1a1d2075973f..322387392864 100644 --- a/nixos/lib/test-driver/src/test_driver/machine.py +++ b/nixos/lib/test-driver/src/test_driver/machine.py @@ -18,7 +18,7 @@ from pathlib import Path from queue import Queue from typing import Any -from test_driver.errors import RequestedAssertionFailed, TestScriptError +from test_driver.errors import MachineError, RequestedAssertionFailed from test_driver.logger import AbstractLogger from .qmp import QMPSession @@ -129,7 +129,7 @@ def _preprocess_screenshot(screenshot_path: str, negate: bool = False) -> str: ) if ret.returncode != 0: - raise TestScriptError( + raise MachineError( f"Image processing failed with exit code {ret.returncode}, stdout: {ret.stdout.decode()}, stderr: {ret.stderr.decode()}" ) @@ -140,7 +140,7 @@ def _perform_ocr_on_screenshot( screenshot_path: str, model_ids: Iterable[int] ) -> list[str]: if shutil.which("tesseract") is None: - raise TestScriptError("OCR requested but enableOCR is false") + raise MachineError("OCR requested but enableOCR is false") processed_image = _preprocess_screenshot(screenshot_path, negate=False) processed_negative = _preprocess_screenshot(screenshot_path, negate=True) @@ -163,7 +163,7 @@ def _perform_ocr_on_screenshot( capture_output=True, ) if ret.returncode != 0: - raise TestScriptError(f"OCR failed with exit code {ret.returncode}") + raise MachineError(f"OCR failed with exit code {ret.returncode}") model_results.append(ret.stdout.decode("utf-8")) return model_results @@ -922,7 +922,7 @@ class Machine: ret = subprocess.run(f"pnmtopng '{tmp}' > '{filename}'", shell=True) os.unlink(tmp) if ret.returncode != 0: - raise TestScriptError("Cannot convert screenshot") + raise MachineError("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 From e2b3517f598471dde1efad1b97ab1a418c6678c9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 21 Mar 2025 12:34:59 +0000 Subject: [PATCH 06/66] nixos/test-driver: use ipython via ptpython Closes #180089 I realized that the previous commits relying on `sys.exit` for dealing with `MachineError`/`RequestedAssertionFailed` exit the interactive session which is kinda bad. This patch uses the ipython driver: it seems to have equivalent features such as auto-completion and doesn't stop on SystemExit being raised. This also fixes other places where this happened such as things calling `log.error` on the CompositeLogger. --- nixos/lib/test-driver/default.nix | 1 + nixos/lib/test-driver/src/test_driver/__init__.py | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/lib/test-driver/default.nix b/nixos/lib/test-driver/default.nix index f22744806d48..91db5d8be3c2 100644 --- a/nixos/lib/test-driver/default.nix +++ b/nixos/lib/test-driver/default.nix @@ -31,6 +31,7 @@ python3Packages.buildPythonApplication { colorama junit-xml ptpython + ipython ] ++ extraPythonPackages python3Packages; diff --git a/nixos/lib/test-driver/src/test_driver/__init__.py b/nixos/lib/test-driver/src/test_driver/__init__.py index 1c0793aa75a5..26d8391017e8 100755 --- a/nixos/lib/test-driver/src/test_driver/__init__.py +++ b/nixos/lib/test-driver/src/test_driver/__init__.py @@ -3,7 +3,7 @@ import os import time from pathlib import Path -import ptpython.repl +import ptpython.ipython from test_driver.driver import Driver from test_driver.logger import ( @@ -136,11 +136,10 @@ def main() -> None: if args.interactive: history_dir = os.getcwd() history_path = os.path.join(history_dir, ".nixos-test-history") - ptpython.repl.embed( - driver.test_symbols(), - {}, + ptpython.ipython.embed( + user_ns=driver.test_symbols(), history_filename=history_path, - ) + ) # type:ignore else: tic = time.time() driver.run_tests() From deff22bcc8ba821efda81d567301a34a3d51b999 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 22 Mar 2025 19:13:48 +0100 Subject: [PATCH 07/66] nixos/test-driver: improve wording on comments about new error handling Co-authored-by: Benoit de Chezelles --- nixos/lib/test-driver/src/test_driver/driver.py | 2 ++ nixos/lib/test-driver/src/test_driver/errors.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/lib/test-driver/src/test_driver/driver.py b/nixos/lib/test-driver/src/test_driver/driver.py index 56f29ffe24f1..49b6692bf422 100644 --- a/nixos/lib/test-driver/src/test_driver/driver.py +++ b/nixos/lib/test-driver/src/test_driver/driver.py @@ -188,6 +188,8 @@ class Driver: sys.exit(1) except RequestedAssertionFailed: exc_type, exc, tb = sys.exc_info() + # We manually print the stack frames, keeping only the ones from the test script + # (note: because the script is not a real file, the frame filename is ``) filtered = [ frame for frame in traceback.extract_tb(tb) diff --git a/nixos/lib/test-driver/src/test_driver/errors.py b/nixos/lib/test-driver/src/test_driver/errors.py index 449fef0d30c7..fe072b5185c9 100644 --- a/nixos/lib/test-driver/src/test_driver/errors.py +++ b/nixos/lib/test-driver/src/test_driver/errors.py @@ -15,6 +15,6 @@ class RequestedAssertionFailed(AssertionError): e.g. a failing `t.assertEqual(...)` or `machine.succeed(...)`. This gets special treatment in error reporting: i.e. it gets - `!!!` as prefix just as `MachineError`, but all stack frames that are - not from `testScript` also get removed. + `!!!` as prefix just as `MachineError`, but only stack frames coming + from `testScript` will show up in logs. """ From 0989f7d25102ec057bd989af408e3bd19f6f564d Mon Sep 17 00:00:00 2001 From: ProggerX Date: Sun, 23 Mar 2025 20:53:08 +0300 Subject: [PATCH 08/66] tshock: init at 5.2.3 --- pkgs/by-name/ts/tshock/deps.nix | 652 +++++++++++++++++++++++++++++ pkgs/by-name/ts/tshock/package.nix | 44 ++ 2 files changed, 696 insertions(+) create mode 100644 pkgs/by-name/ts/tshock/deps.nix create mode 100644 pkgs/by-name/ts/tshock/package.nix diff --git a/pkgs/by-name/ts/tshock/deps.nix b/pkgs/by-name/ts/tshock/deps.nix new file mode 100644 index 000000000000..f5d773417b6a --- /dev/null +++ b/pkgs/by-name/ts/tshock/deps.nix @@ -0,0 +1,652 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! +# TODO: This format file is obsolete, consider migrating to JSON. + +{ fetchNuGet }: +[ + (fetchNuGet { + pname = "BCrypt.Net-Next"; + version = "4.0.3"; + hash = "sha256-BxXHAjIV2xBuRPUezzC+5jhaHiQhgnqTk1k1ko3D6Ds="; + }) + (fetchNuGet { + pname = "BouncyCastle.Cryptography"; + version = "2.2.1"; + hash = "sha256-KDNexXG10Ub5G0M5BOvaFDByGPiSo0HG8GJWWB473Y0="; + }) + (fetchNuGet { + pname = "GetText.NET"; + version = "1.7.14"; + hash = "sha256-IR27r7SZJFomN/bu4hO5SeQNGr67DQREIKdjsV7RICc="; + }) + (fetchNuGet { + pname = "Google.Protobuf"; + version = "3.25.1"; + hash = "sha256-UfP/iIcARptUcTVptj/5JQ9Jz9AG3aj+iKotsetOnH0="; + }) + (fetchNuGet { + pname = "K4os.Compression.LZ4"; + version = "1.3.5"; + hash = "sha256-M0FaJTS3XRBp5tV02BhrrOLVyzP39cQnpEVY8KGNads="; + }) + (fetchNuGet { + pname = "K4os.Compression.LZ4.Streams"; + version = "1.3.5"; + hash = "sha256-BhR48hN/7z2NVgMw1MRnilpjAUNMZ0LDDhmVYnCXoCY="; + }) + (fetchNuGet { + pname = "K4os.Hash.xxHash"; + version = "1.0.8"; + hash = "sha256-ILTWT8NFB7itGpDloJh65B5ZuWHrN2dOUQdm8gNy4W8="; + }) + (fetchNuGet { + pname = "Microsoft.Data.Sqlite"; + version = "6.0.11"; + hash = "sha256-K+2ZSdaQ9XrAglqxjlIkwBj4NlHhV7FvHTfNCM11u7k="; + }) + (fetchNuGet { + pname = "Microsoft.Data.Sqlite.Core"; + version = "6.0.11"; + hash = "sha256-ndL66WlBdAOU6V8k23d/T11r0s8gnBqbGWRZF9Bc7AU="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "2.0.0"; + hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "3.1.0"; + hash = "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.SystemEvents"; + version = "4.7.0"; + hash = "sha256-GHxnD1Plb32GJWVWSv0Y51Kgtlb+cdKgOYVBYZSgVF4="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.SystemEvents"; + version = "6.0.0"; + hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; + }) + (fetchNuGet { + pname = "ModFramework"; + version = "1.1.7"; + hash = "sha256-fKP5njd+98RYQ/1tqaT0vyIalZbcSUQdo50ucQ7F1hk="; + }) + (fetchNuGet { + pname = "Mono.Cecil"; + version = "0.11.4"; + hash = "sha256-HrnRgFsOzfqAWw0fUxi/vkzZd8dMn5zueUeLQWA9qvs="; + }) + (fetchNuGet { + pname = "MonoMod"; + version = "22.5.1.1"; + hash = "sha256-VB1xZV+MLAzB/e6uTKW2/IEy9Qzo6vzsxg5ot1bWiPs="; + }) + (fetchNuGet { + pname = "MonoMod.RuntimeDetour"; + version = "22.5.1.1"; + hash = "sha256-ivxQJ6VWxzapaxkDvkRZvDQVgpfmFP1afRlx6yolBXM="; + }) + (fetchNuGet { + pname = "MonoMod.RuntimeDetour.HookGen"; + version = "22.5.1.1"; + hash = "sha256-jKPij21zrysQO8MnzECpJKVAqil5ZdODyGZOx7j0dRg="; + }) + (fetchNuGet { + pname = "MonoMod.Utils"; + version = "22.5.1.1"; + hash = "sha256-5m6C8anC0Z4Ihaxg6PTmXU7UOGiyzV+byZDO8+w/kl8="; + }) + (fetchNuGet { + pname = "MySql.Data"; + version = "8.4.0"; + hash = "sha256-fbNsIdRJVbD7NfAKhDJWDq5m5vXcRGzl9DBzQytM4cA="; + }) + (fetchNuGet { + pname = "Newtonsoft.Json"; + version = "13.0.1"; + hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; + }) + (fetchNuGet { + pname = "NuGet.Common"; + version = "6.3.1"; + hash = "sha256-N6NMNL4d2IQsa/AEjyBesbStXTtR8kaL2e7aW7BdBvs="; + }) + (fetchNuGet { + pname = "NuGet.Common"; + version = "6.3.4"; + hash = "sha256-GDzEyx9/wdVOUAri94uoDjChmfDnBhI90nBfzoHarts="; + }) + (fetchNuGet { + pname = "NuGet.Configuration"; + version = "6.3.1"; + hash = "sha256-Ha04pwa124ptbBH/PBn45dBGpDIPKcMDd+Fil91g728="; + }) + (fetchNuGet { + pname = "NuGet.Configuration"; + version = "6.3.4"; + hash = "sha256-qXIONIKcCIXJUmNJQs7MINQ18qIEUByTtW5xsORoZoc="; + }) + (fetchNuGet { + pname = "NuGet.Frameworks"; + version = "6.3.1"; + hash = "sha256-FAzvIULDH4/MnutbHL3NUZwpzcBAu0qgSKitFSTlbJY="; + }) + (fetchNuGet { + pname = "NuGet.Frameworks"; + version = "6.3.4"; + hash = "sha256-zqogus3HXQYSiqfnhVH2jd2VZXa+uTsmaw/uwD8dlgY="; + }) + (fetchNuGet { + pname = "NuGet.Packaging"; + version = "6.3.1"; + hash = "sha256-YiHpqIbOmfYMtJKACeL2nJ5oRngHTPcLN8e4+6IBggs="; + }) + (fetchNuGet { + pname = "NuGet.Packaging"; + version = "6.3.4"; + hash = "sha256-1LKM5vgfNKn8v2LcqialwmcynACISR57q13n7I2lQbU="; + }) + (fetchNuGet { + pname = "NuGet.Protocol"; + version = "6.3.1"; + hash = "sha256-9dYUTW/oor665WSDG6mu7HILPVzdO2/2pgiEPb5NMF0="; + }) + (fetchNuGet { + pname = "NuGet.Protocol"; + version = "6.3.3"; + hash = "sha256-xRW7RMwHqSvTUhSaSI5s2OTSUtcLvvi4dy3ncXIb9I4="; + }) + (fetchNuGet { + pname = "NuGet.Resolver"; + version = "6.3.1"; + hash = "sha256-NAvCKWepFnswh5Q8ecGXhfki7i2lDahDCit9v706mrE="; + }) + (fetchNuGet { + pname = "NuGet.Versioning"; + version = "6.3.1"; + hash = "sha256-wNM/C2Y+K+gjceaXD2nHuBkZZgshBMo9NQ9h9gz/RnQ="; + }) + (fetchNuGet { + pname = "NuGet.Versioning"; + version = "6.3.4"; + hash = "sha256-6CMYVQeGfXu+xner3T3mgl/iQfXiYixoHizmrNA6bvQ="; + }) + (fetchNuGet { + pname = "OTAPI.Upcoming"; + version = "3.1.20"; + hash = "sha256-ONMBrJG5hDmdkRQhyF0tHxd5M/NebsOkhQmnyfKVK0Y="; + }) + (fetchNuGet { + pname = "runtime.any.System.Collections"; + version = "4.3.0"; + hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; + }) + (fetchNuGet { + pname = "runtime.any.System.Globalization"; + version = "4.3.0"; + hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; + }) + (fetchNuGet { + pname = "runtime.any.System.IO"; + version = "4.3.0"; + hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection"; + version = "4.3.0"; + hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection.Extensions"; + version = "4.3.0"; + hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection.Primitives"; + version = "4.3.0"; + hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; + }) + (fetchNuGet { + pname = "runtime.any.System.Resources.ResourceManager"; + version = "4.3.0"; + hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime"; + version = "4.3.0"; + hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime.Handles"; + version = "4.3.0"; + hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime.InteropServices"; + version = "4.3.0"; + hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; + }) + (fetchNuGet { + pname = "runtime.any.System.Text.Encoding"; + version = "4.3.0"; + hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; + }) + (fetchNuGet { + pname = "runtime.any.System.Threading.Tasks"; + version = "4.3.0"; + hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; + }) + (fetchNuGet { + pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; + }) + (fetchNuGet { + pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; + }) + (fetchNuGet { + pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; + }) + (fetchNuGet { + pname = "runtime.native.System"; + version = "4.3.0"; + hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; + }) + (fetchNuGet { + pname = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; + }) + (fetchNuGet { + pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; + }) + (fetchNuGet { + pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; + }) + (fetchNuGet { + pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; + }) + (fetchNuGet { + pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Diagnostics.Debug"; + version = "4.3.0"; + hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Private.Uri"; + version = "4.3.0"; + hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; + }) + (fetchNuGet { + pname = "runtime.unix.System.Runtime.Extensions"; + version = "4.3.0"; + hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; + }) + (fetchNuGet { + pname = "SharpZipLib"; + version = "1.4.2"; + hash = "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY="; + }) + (fetchNuGet { + pname = "SQLitePCLRaw.bundle_e_sqlite3"; + version = "2.0.6"; + hash = "sha256-o6uXTtcxjb7H33I8UL4XLgx9y/f/iNeXx6z0NopR4MY="; + }) + (fetchNuGet { + pname = "SQLitePCLRaw.core"; + version = "2.0.6"; + hash = "sha256-MXi9UEga37dJyFuMg0AVt8enKdr54KlOFT/ssMHzkfA="; + }) + (fetchNuGet { + pname = "SQLitePCLRaw.lib.e_sqlite3"; + version = "2.0.6"; + hash = "sha256-o68At523MDwLEuRxjM+4EiydK4ITSFyc9R0zGmBGZ5g="; + }) + (fetchNuGet { + pname = "SQLitePCLRaw.provider.e_sqlite3"; + version = "2.0.6"; + hash = "sha256-308v2h3rvcPSsR9F+yFdJC1QEHgOQtuVxTMs5j3ODzI="; + }) + (fetchNuGet { + pname = "Steamworks.NET"; + version = "20.1.0"; + hash = "sha256-vt1UVbH4mHGPm7hTW2wKRrSzaFaHz9ZSuiaYeOhs6Ws="; + }) + (fetchNuGet { + pname = "System.Buffers"; + version = "4.5.1"; + hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; + }) + (fetchNuGet { + pname = "System.Collections"; + version = "4.3.0"; + hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; + }) + (fetchNuGet { + pname = "System.Collections.Immutable"; + version = "6.0.0"; + hash = "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="; + }) + (fetchNuGet { + pname = "System.Collections.NonGeneric"; + version = "4.3.0"; + hash = "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8="; + }) + (fetchNuGet { + pname = "System.Collections.Specialized"; + version = "4.3.0"; + hash = "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk="; + }) + (fetchNuGet { + pname = "System.CommandLine"; + version = "2.0.0-beta4.22272.1"; + hash = "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc="; + }) + (fetchNuGet { + pname = "System.ComponentModel"; + version = "4.3.0"; + hash = "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU="; + }) + (fetchNuGet { + pname = "System.ComponentModel.Primitives"; + version = "4.3.0"; + hash = "sha256-IOMJleuIBppmP4ECB3uftbdcgL7CCd56+oAD/Sqrbus="; + }) + (fetchNuGet { + pname = "System.ComponentModel.TypeConverter"; + version = "4.3.0"; + hash = "sha256-PSDiPYt8PgTdTUBz+GH6lHCaM1YgfObneHnZsc8Fz54="; + }) + (fetchNuGet { + pname = "System.Configuration.ConfigurationManager"; + version = "4.4.1"; + hash = "sha256-4i8PUO1XTLfdUzeFxfHtR6xOP7mM3DD+ST9FviQl7zc="; + }) + (fetchNuGet { + pname = "System.Configuration.ConfigurationManager"; + version = "6.0.0"; + hash = "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Debug"; + version = "4.3.0"; + hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; + }) + (fetchNuGet { + pname = "System.Diagnostics.DiagnosticSource"; + version = "7.0.2"; + hash = "sha256-8Uawe7mWOQsDzMSAAP16nuGD1FRSajyS8q+cA++MJ8E="; + }) + (fetchNuGet { + pname = "System.Diagnostics.PerformanceCounter"; + version = "6.0.1"; + hash = "sha256-53t07yyRBb6sC4e3IjTp5fj44+p6JpX2zpr5/Bbf5Z4="; + }) + (fetchNuGet { + pname = "System.Drawing.Common"; + version = "4.7.0"; + hash = "sha256-D3qG+xAe78lZHvlco9gHK2TEAM370k09c6+SQi873Hk="; + }) + (fetchNuGet { + pname = "System.Drawing.Common"; + version = "6.0.0"; + hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; + }) + (fetchNuGet { + pname = "System.Formats.Asn1"; + version = "5.0.0"; + hash = "sha256-9nL3dN4w/dZ49W1pCkTjRqZm6Dh0mMVExNungcBHrKs="; + }) + (fetchNuGet { + pname = "System.Globalization"; + version = "4.3.0"; + hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; + }) + (fetchNuGet { + pname = "System.Globalization.Extensions"; + version = "4.3.0"; + hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; + }) + (fetchNuGet { + pname = "System.IO"; + version = "4.3.0"; + hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; + }) + (fetchNuGet { + pname = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; + }) + (fetchNuGet { + pname = "System.IO.Pipelines"; + version = "6.0.3"; + hash = "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck="; + }) + (fetchNuGet { + pname = "System.Linq"; + version = "4.3.0"; + hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; + }) + (fetchNuGet { + pname = "System.Memory"; + version = "4.5.3"; + hash = "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="; + }) + (fetchNuGet { + pname = "System.Private.Uri"; + version = "4.3.0"; + hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; + }) + (fetchNuGet { + pname = "System.Reflection"; + version = "4.3.0"; + hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.ILGeneration"; + version = "4.7.0"; + hash = "sha256-GUnQeGo/DtvZVQpFnESGq7lJcjB30/KnDY7Kd2G/ElE="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.Lightweight"; + version = "4.7.0"; + hash = "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU="; + }) + (fetchNuGet { + pname = "System.Reflection.Extensions"; + version = "4.3.0"; + hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; + }) + (fetchNuGet { + pname = "System.Reflection.Metadata"; + version = "6.0.0"; + hash = "sha256-VJHXPjP05w6RE/Swu8wa2hilEWuji3g9bl/6lBMSC/Q="; + }) + (fetchNuGet { + pname = "System.Reflection.MetadataLoadContext"; + version = "6.0.0"; + hash = "sha256-82aeU8c4rnYPLL3ba1ho1fxfpYQt5qrSK5e6ES+OTsY="; + }) + (fetchNuGet { + pname = "System.Reflection.Primitives"; + version = "4.3.0"; + hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; + }) + (fetchNuGet { + pname = "System.Reflection.TypeExtensions"; + version = "4.7.0"; + hash = "sha256-GEtCGXwtOnkYejSV+Tfl+DqyGq5jTUaVyL9eMupMHBM="; + }) + (fetchNuGet { + pname = "System.Resources.ResourceManager"; + version = "4.3.0"; + hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; + }) + (fetchNuGet { + pname = "System.Runtime"; + version = "4.3.0"; + hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; + }) + (fetchNuGet { + pname = "System.Runtime.CompilerServices.Unsafe"; + version = "6.0.0"; + hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; + }) + (fetchNuGet { + pname = "System.Runtime.Extensions"; + version = "4.3.0"; + hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; + }) + (fetchNuGet { + pname = "System.Runtime.Handles"; + version = "4.3.0"; + hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; + }) + (fetchNuGet { + pname = "System.Runtime.InteropServices"; + version = "4.3.0"; + hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; + }) + (fetchNuGet { + pname = "System.Runtime.Loader"; + version = "4.3.0"; + hash = "sha256-syG1GTFjYbwX146BD/L7t55j+DZqpHDc6z28kdSNzx0="; + }) + (fetchNuGet { + pname = "System.Security.AccessControl"; + version = "4.7.0"; + hash = "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g="; + }) + (fetchNuGet { + pname = "System.Security.AccessControl"; + version = "6.0.0"; + hash = "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Cng"; + version = "5.0.0"; + hash = "sha256-nOJP3vdmQaYA07TI373OvZX6uWshETipvi5KpL7oExo="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.Pkcs"; + version = "5.0.0"; + hash = "sha256-kq/tvYQSa24mKSvikFK2fKUAnexSL4PO4LkPppqtYkE="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.ProtectedData"; + version = "4.4.0"; + hash = "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE="; + }) + (fetchNuGet { + pname = "System.Security.Cryptography.ProtectedData"; + version = "6.0.0"; + hash = "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="; + }) + (fetchNuGet { + pname = "System.Security.Permissions"; + version = "4.7.0"; + hash = "sha256-BGgXMLUi5rxVmmChjIhcXUxisJjvlNToXlyaIbUxw40="; + }) + (fetchNuGet { + pname = "System.Security.Permissions"; + version = "6.0.0"; + hash = "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="; + }) + (fetchNuGet { + pname = "System.Security.Principal.Windows"; + version = "4.7.0"; + hash = "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg="; + }) + (fetchNuGet { + pname = "System.Text.Encoding"; + version = "4.3.0"; + hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; + }) + (fetchNuGet { + pname = "System.Text.Encoding.CodePages"; + version = "4.4.0"; + hash = "sha256-zD24blG8xhAcL9gC4UTGKetd8c3LO0nv22nKTp2Vfx0="; + }) + (fetchNuGet { + pname = "System.Text.Encodings.Web"; + version = "7.0.0"; + hash = "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ="; + }) + (fetchNuGet { + pname = "System.Text.Json"; + version = "7.0.1"; + hash = "sha256-wtk7fK3c/zAsaPB5oCmD86OfpPEJlGK3npr0mbM1ENM="; + }) + (fetchNuGet { + pname = "System.Threading"; + version = "4.3.0"; + hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks"; + version = "4.3.0"; + hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks.Extensions"; + version = "4.5.4"; + hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; + }) + (fetchNuGet { + pname = "System.Windows.Extensions"; + version = "4.7.0"; + hash = "sha256-yW+GvQranReaqPw5ZFv+mSjByQ5y1pRLl05JIEf3tYU="; + }) + (fetchNuGet { + pname = "System.Windows.Extensions"; + version = "6.0.0"; + hash = "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="; + }) + (fetchNuGet { + pname = "ZstdSharp.Port"; + version = "0.7.1"; + hash = "sha256-VzvKkpVjR7yKQyXhf6Ljf9ikMAQkbPWUiGFOeluanS4="; + }) +] diff --git a/pkgs/by-name/ts/tshock/package.nix b/pkgs/by-name/ts/tshock/package.nix new file mode 100644 index 000000000000..5e4379c8d954 --- /dev/null +++ b/pkgs/by-name/ts/tshock/package.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchFromGitHub, + buildDotnetModule, + dotnet-sdk_6, + dotnet-runtime_6, +}: +buildDotnetModule rec { + pname = "tshock"; + version = "5.2.3"; + + src = fetchFromGitHub { + owner = "Pryaxis"; + repo = "TShock"; + rev = "v${version}"; + sha256 = "sha256-1EtHpBZ7bbwVbl+tMfwpjgPuxu98XKvxlZ2+SbUlWV4="; + fetchSubmodules = true; + }; + + dotnet-sdk = dotnet-sdk_6; + dotnet-runtime = dotnet-runtime_6; + executables = [ "TShock.Server" ]; + + projectFile = [ + "TShockAPI/TShockAPI.csproj" + "TerrariaServerAPI/TerrariaServerAPI/TerrariaServerAPI.csproj" + "TShockLauncher/TShockLauncher.csproj" + "TShockInstaller/TShockInstaller.csproj" + "TShockPluginManager/TShockPluginManager.csproj" + ]; # Excluding tests because they can't build for some reason + + doCheck = false; # The same. + + nugetSource = "https://api.nuget.org/v3/index.json"; + nugetDeps = ./deps.nix; + + meta = with lib; { + homepage = "https://github.com/Pryaxis/TShock"; + description = "Modded server software for Terraria, providing a plugin system and inbuilt tools such as anti-cheat, server-side characters, groups, permissions, and item bans."; + license = licenses.gpl3Only; + maintainers = [ maintainers.proggerx ]; + mainProgram = "TShock.Server"; + }; +} From a75ec05cc89af64468da07c139ba738d575d5bc8 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 9 Apr 2025 11:47:06 -0400 Subject: [PATCH 09/66] python313Packages.lightning: init at 2.5.1 --- .../python-modules/lightning/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/lightning/default.nix diff --git a/pkgs/development/python-modules/lightning/default.nix b/pkgs/development/python-modules/lightning/default.nix new file mode 100644 index 000000000000..e3a096c9163b --- /dev/null +++ b/pkgs/development/python-modules/lightning/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + pytorch-lightning, + + # tests + psutil, + pytestCheckHook, +}: + +buildPythonPackage { + pname = "lightning"; + pyproject = true; + + inherit (pytorch-lightning) + version + src + build-system + meta + ; + + dependencies = pytorch-lightning.dependencies ++ [ pytorch-lightning ]; + + nativeCheckInputs = [ + psutil + pytestCheckHook + ]; + + # Some packages are not in NixPkgs; other tests try to build distributed + # models, which doesn't work in the sandbox. + doCheck = false; + + pythonImportsCheck = [ + "lightning" + "lightning.pytorch" + ]; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7f725c55c9c1..57d880a4b71b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7869,6 +7869,8 @@ self: super: with self; { lightify = callPackage ../development/python-modules/lightify { }; + lightning = callPackage ../development/python-modules/lightning { }; + lightning-utilities = callPackage ../development/python-modules/lightning-utilities { }; lightparam = callPackage ../development/python-modules/lightparam { }; From 40528439f3b8423d5e5bad7efb8ecee198159952 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 12 Apr 2025 19:10:26 +0200 Subject: [PATCH 10/66] workflows: make requested permissions explicit for create-github-app-token Resolves #396875 --- .github/workflows/backport.yml | 2 ++ .github/workflows/codeowners-v2.yml | 5 +++++ .github/workflows/eval.yml | 3 +++ .github/workflows/periodic-merge.yml | 2 ++ 4 files changed, 12 insertions(+) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 12731f8d80a1..bbc18fdeebea 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -24,6 +24,8 @@ jobs: with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }} + permission-contents: write + permission-pull-requests: write - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml index 7b97922104bb..d2b33755687e 100644 --- a/.github/workflows/codeowners-v2.yml +++ b/.github/workflows/codeowners-v2.yml @@ -68,6 +68,8 @@ jobs: with: app-id: ${{ vars.OWNER_RO_APP_ID }} private-key: ${{ secrets.OWNER_RO_APP_PRIVATE_KEY }} + permission-administration: read + permission-members: read - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: @@ -101,6 +103,9 @@ jobs: with: app-id: ${{ vars.OWNER_APP_ID }} private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }} + permission-administration: read + permission-members: read + permission-pull-requests: write - name: Build review request package run: nix-build ci -A requestReviews diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 44b5cabbd4b6..cf4b06557756 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -249,6 +249,9 @@ jobs: with: app-id: ${{ vars.OWNER_APP_ID }} private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }} + permission-administration: read + permission-members: read + permission-pull-requests: write - name: Download process result uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml index a64983022777..4a083b050e22 100644 --- a/.github/workflows/periodic-merge.yml +++ b/.github/workflows/periodic-merge.yml @@ -24,6 +24,8 @@ jobs: with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }} + permission-contents: write + permission-pull-requests: write - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 From 64da2f7bfea9644126bd18eaed8195209b42b847 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Apr 2025 00:32:35 +0000 Subject: [PATCH 11/66] berglas: 2.0.7 -> 2.0.8 --- pkgs/by-name/be/berglas/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/be/berglas/package.nix b/pkgs/by-name/be/berglas/package.nix index d5412784ba4a..23d58fc3a53b 100644 --- a/pkgs/by-name/be/berglas/package.nix +++ b/pkgs/by-name/be/berglas/package.nix @@ -35,16 +35,16 @@ in buildGoModule rec { pname = "berglas"; - version = "2.0.7"; + version = "2.0.8"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bW8D8g4FPx0i4iPP7Pvm0UpaJFNsECR3kuHEZn8NLx0="; + sha256 = "sha256-gBZY/xj/T7UYQ5mnN6udpBKViE/RYz9tmbmYN+JqsBk="; }; - vendorHash = "sha256-+ncl/6BJ7J2cby29I1IvkUgbiyDP+co/+Cyyh/V8A1I="; + vendorHash = "sha256-NR4YoaJ5ztc7eokRexNzDBtAH7JM4vZH13K550KWFNM="; ldflags = [ "-s" From b22661b0056ed7e4715f1663f1a512a09b40eb64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Apr 2025 00:40:33 +0000 Subject: [PATCH 12/66] commonsIo: 2.18.0 -> 2.19.0 --- pkgs/by-name/co/commonsIo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/commonsIo/package.nix b/pkgs/by-name/co/commonsIo/package.nix index 92156099c103..e3efd73f85e6 100644 --- a/pkgs/by-name/co/commonsIo/package.nix +++ b/pkgs/by-name/co/commonsIo/package.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.18.0"; + version = "2.19.0"; pname = "commons-io"; src = fetchurl { url = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "sha256-qrB4cLnvaTQaZJWrrDO8IYsYI2hp6/nN7nCRcFhKTeE="; + sha256 = "sha256-zhS4nMCrwL2w2qNXco5oRkXSiOzzepD6EiZzmCgfnNI="; }; installPhase = '' From a8d37609ed634825756d7e2f11e549b644a1b5d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Apr 2025 07:49:05 +0000 Subject: [PATCH 13/66] rocketchat-desktop: 4.3.0 -> 4.3.3 --- pkgs/by-name/ro/rocketchat-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ro/rocketchat-desktop/package.nix b/pkgs/by-name/ro/rocketchat-desktop/package.nix index 1745964765c9..f61d0c5c2cbd 100644 --- a/pkgs/by-name/ro/rocketchat-desktop/package.nix +++ b/pkgs/by-name/ro/rocketchat-desktop/package.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "4.3.0"; + version = "4.3.3"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; - hash = "sha256-WyRZfUdUAX8YIXXoAUPp6Icr52xad4S7t5V99SxIU/w="; + hash = "sha256-2/AOHsIeYXqjCeDMEeSzhTEfgkHo4fX0cFdx5gXvfNk="; }; nativeBuildInputs = [ From db93b1e97ad54c0c806ab6967e71519bfaaf236f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Apr 2025 10:35:28 +0000 Subject: [PATCH 14/66] python312Packages.edalize: 0.6.0 -> 0.6.1 --- pkgs/development/python-modules/edalize/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix index 4a77f5cf4385..f1dfca43a7d9 100644 --- a/pkgs/development/python-modules/edalize/default.nix +++ b/pkgs/development/python-modules/edalize/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "edalize"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "olofk"; repo = pname; tag = "v${version}"; - hash = "sha256-TCMzvRWd2Fx2/7UtUGOwblLhRyTAqPp9s70Oyc3U3r0="; + hash = "sha256-5c3Szq0tXQdlyzFTFCla44qB/O6RK8vezVOaFOv8sw4="; }; postPatch = '' @@ -102,7 +102,7 @@ buildPythonPackage rec { description = "Abstraction library for interfacing EDA tools"; mainProgram = "el_docker"; homepage = "https://github.com/olofk/edalize"; - changelog = "https://github.com/olofk/edalize/releases/tag/v${version}"; + changelog = "https://github.com/olofk/edalize/releases/tag/${src.tag}"; license = licenses.bsd2; maintainers = with maintainers; [ astro ]; }; From 63d473090ed5d1fa5f4213ba8d3af8343d796897 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Apr 2025 11:44:31 +0200 Subject: [PATCH 15/66] python312Packages.dash-bootstrap-components: 2.0.0 -> 2.0.1 Changelog: https://github.com/facultyai/dash-bootstrap-components/releases/tag/2.0.1 --- .../python-modules/dash-bootstrap-components/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dash-bootstrap-components/default.nix b/pkgs/development/python-modules/dash-bootstrap-components/default.nix index bc093fdae57a..9dc33d119b02 100644 --- a/pkgs/development/python-modules/dash-bootstrap-components/default.nix +++ b/pkgs/development/python-modules/dash-bootstrap-components/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "dash-bootstrap-components"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "dash_bootstrap_components"; - hash = "sha256-cRIwo164ZmS1wFUqkdFZ9LRz2EEs9bSPNF+7ARjq35E="; + hash = "sha256-PMZYbzfLP8wEvHLTgBwHt5IEAGaizHjSMwiFUpJl7Cg="; }; build-system = [ hatchling ]; From 707c48c1b3c02252bbf739232d10ae97d1ca9361 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 20 Apr 2025 01:17:32 +0200 Subject: [PATCH 16/66] python312Packages.awscrt: refactor --- pkgs/development/python-modules/awscrt/default.nix | 12 ++++-------- pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index dc09c49df9b2..c152cbd54490 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -2,30 +2,26 @@ lib, buildPythonPackage, fetchPypi, + setuptools, cmake, perl, stdenv, - CoreFoundation, - Security, pythonOlder, }: buildPythonPackage rec { pname = "awscrt"; version = "0.26.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; hash = "sha256-qNY6fcxkhMXBZ1sxqNG2cmw9yFsTeW+xQ9+wByJgk14="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - Security - ]; + build-system = [ setuptools ]; nativeBuildInputs = [ cmake ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ perl ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a6a77d1ea23..35f4f28d425f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1197,9 +1197,7 @@ self: super: with self; { aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; - awscrt = callPackage ../development/python-modules/awscrt { - inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; - }; + awscrt = callPackage ../development/python-modules/awscrt { }; awsiotpythonsdk = callPackage ../development/python-modules/awsiotpythonsdk { }; From 1ea3c1d9676c9214492e82464174094c2130e002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Sun, 20 Apr 2025 10:42:24 +0200 Subject: [PATCH 17/66] nushell: re-enable tests on darwin --- pkgs/shells/nushell/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index b4a39b23c1ff..60f1fefe8221 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -19,6 +19,7 @@ testers, nushell, nix-update-script, + curlMinimal, }: let @@ -64,8 +65,6 @@ rustPlatform.buildRustPackage { buildNoDefaultFeatures = !withDefaultFeatures; buildFeatures = additionalFeatures [ ]; - doCheck = !stdenv.hostPlatform.isDarwin; # Skip checks on darwin. Failing tests since 0.96.0 - checkPhase = '' runHook preCheck ( @@ -82,6 +81,10 @@ rustPlatform.buildRustPackage { runHook postCheck ''; + checkInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + curlMinimal + ]; + passthru = { shellPath = "/bin/nu"; tests.version = testers.testVersion { From d44794cfbf7d8f62937b0f63a5484f57a081be64 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sun, 20 Apr 2025 21:33:09 -0300 Subject: [PATCH 18/66] starship: add sigmasquadron to meta.maintainers The module inherits the package's maintainers as the module maintainers. Signed-off-by: Fernando Rodrigues --- pkgs/by-name/st/starship/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/st/starship/package.nix b/pkgs/by-name/st/starship/package.nix index 22feec90455b..76e7fdc124ec 100644 --- a/pkgs/by-name/st/starship/package.nix +++ b/pkgs/by-name/st/starship/package.nix @@ -76,6 +76,7 @@ rustPlatform.buildRustPackage (finalAttrs: { Br1ght0ne Frostman awwpotato + sigmasquadron ]; mainProgram = "starship"; }; From d19a913454088168e2f9b3543930ee3fc39b32e6 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sun, 20 Apr 2025 21:33:09 -0300 Subject: [PATCH 19/66] nixos/starship: add transientPrompt option set for starship on fish shells On `fish`, Starship supports transient prompts with no external dependencies. This commit adds three options that allows users to edit the function bodies of `starship_transient_prompt_func` and `starship_transient_rprompt_func` and call `enable_transience` after the Starship initialisation code is sourced into the shell. This avoids the need for downstream NixOS configurations to use the `programs.fish.promptInit` option with the `lib.mkAfter` function to correctly enable transience. Signed-off-by: Fernando Rodrigues --- nixos/modules/programs/starship.nix | 52 +++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/nixos/modules/programs/starship.nix b/nixos/modules/programs/starship.nix index 17a2cf9b8666..044054c5452f 100644 --- a/nixos/modules/programs/starship.nix +++ b/nixos/modules/programs/starship.nix @@ -65,6 +65,47 @@ in See https://starship.rs/config/#prompt for documentation. ''; }; + + transientPrompt = + let + mkTransientPromptOption = + side: + lib.mkOption { + type = + with lib.types; + nullOr (str // { description = "Fish shell code concatenated with \"\\n\""; }); + description = + let + function = "`starship_transient_${lib.optionalString (side == "right") "r"}prompt_func` function"; + in + '' + Fish code composing the body of the ${function}. The output of + this code will become the ${side} side of the transient prompt. + + Not setting this option (or setting it to `null`) will prevent + the ${function} from being generated. By default, the ${side} + prompt is ${if (side == "right") then "empty" else "a bold-green '❯' character"}. + ''; + example = "starship module ${if (side == "right") then "time" else "character"}"; + default = null; + }; + in + { + enable = lib.mkEnableOption '' + Starship's [transient prompt](https://starship.rs/advanced-config/#transientprompt-and-transientrightprompt-in-fish) + feature in `fish` shells. After a command has been entered, Starship + replaces the usual prompt with the terminal output of the commands + defined in the `programs.starship.transientPrompt.left` + and `programs.starship.transientPrompt.right` options. + + This option only works with `fish`, as `bash` requires a + [custom configuration](https://starship.rs/advanced-config/#transientprompt-and-transientrightprompt-in-bash) + involving [Ble.sh](https://github.com/akinomyoga/ble.sh), which can be + enabled with `programs.bash.blesh.enable`, but not configured using NixOS + ''; + left = mkTransientPromptOption "left"; + right = mkTransientPromptOption "right"; + }; }; config = lib.mkIf cfg.enable { @@ -90,7 +131,18 @@ in if not test -f "$HOME/.config/starship.toml"; set -x STARSHIP_CONFIG ${settingsFile} end + ${lib.optionalString (!isNull cfg.transientPrompt.left) '' + function starship_transient_prompt_func + ${cfg.transientPrompt.left} + end + ''} + ${lib.optionalString (!isNull cfg.transientPrompt.right) '' + function starship_transient_rprompt_func + ${cfg.transientPrompt.right} + end + ''} eval (${cfg.package}/bin/starship init fish) + ${lib.optionalString cfg.transientPrompt.enable "enable_transience"} end ''; From 5e1bb12915f486ba2651e40eea556f7fd97ef85b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 23 Apr 2025 09:04:58 +0200 Subject: [PATCH 20/66] python313Packages.tencentcloud-sdk-python: 3.0.1363 -> 3.0.1364 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1363...refs/tags/3.0.1364 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1364/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 47b310bc166d..3909db32ae87 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1363"; + version = "3.0.1364"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-VcPedb0qTAzZQpHBAcJtZZhBcGasMcBxH9MQ5tnHcks="; + hash = "sha256-BkbOn+HCWVzGQW+glSKm+vAa8ZOQKCEMyL4gUC9e9GM="; }; build-system = [ setuptools ]; From 9190812859a93e15bf342701f0e3160ee074e518 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Apr 2025 23:04:14 +0000 Subject: [PATCH 21/66] python312Packages.streamlit: 1.44.0 -> 1.44.1 --- pkgs/development/python-modules/streamlit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index 604586353214..150badc34f04 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.44.0"; + version = "1.44.1"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-2nWTO66UWVFn9Dgi3qQ/zd4NdHQz99BJiSZteJZ5Ubs="; + hash = "sha256-xpFO1tW3aHC0YVEEdoBts3DzZCWuDmZU0ifJiCiBmNM="; }; build-system = [ From a7b02ad39b4514dfa2b5166404b6a305c9a65325 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Tue, 22 Apr 2025 22:21:01 +0200 Subject: [PATCH 22/66] element-desktop: 1.11.97 -> 1.11.99 --- pkgs/by-name/el/element-desktop/element-desktop-pin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix index 732b2cc0676d..2cf6c048791f 100644 --- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix +++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.97"; + "version" = "1.11.99"; "hashes" = { - "desktopSrcHash" = "sha256-4ea5C1I/bdGsy4CxsNB1GWL8RQnJpHr/MbIOB5Z+gFA="; - "desktopYarnHash" = "sha256-HI/aRf9pGao8m8z3oA0wdbjDQth3zijJeskV2D+KsgM="; + "desktopSrcHash" = "sha256-vfbCcRd2vwdH45qDpavSJksU71S3adnK6KYS4jwKUkk="; + "desktopYarnHash" = "sha256-AP/qoYiOfq7Etc9TqeNjXM1nAJ1FlgzT2fPIimybeEk="; }; } From 4dd34987d55ecbfc72c765f7385bbe0bb7070063 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Tue, 22 Apr 2025 22:21:28 +0200 Subject: [PATCH 23/66] element-web: 1.11.97 -> 1.11.99 --- pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix index efbc4f9e8d79..a795680799a2 100644 --- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix +++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.97"; + "version" = "1.11.99"; "hashes" = { - "webSrcHash" = "sha256-x7VS4l2uwXq2wjZeGwnaENHlhwnVz5Gt3f55kiH2Zhk="; - "webYarnHash" = "sha256-uwuBwAZYjt3WsbUCM8q9PaiV5WxKSpyJyVzM8gJOhPo="; + "webSrcHash" = "sha256-yTOvvoTt6HnXq+QFshYjpt0q5hpcR8cjpxgoyBtS2X0="; + "webYarnHash" = "sha256-kgwM1zo7/lRS2g/4fHuT/Z/fExOg6hWAJ7xoKt7vYA8="; }; } From e33f0fd5f00fa60dd6aa57c553573b692ea47e72 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 01:03:26 +0000 Subject: [PATCH 24/66] python312Packages.marimo: 0.12.9 -> 0.13.1 --- pkgs/development/python-modules/marimo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index c13eb4f56680..153cad0501af 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -33,13 +33,13 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.12.9"; + version = "0.13.1"; pyproject = true; # The github archive does not include the static assets src = fetchPypi { inherit pname version; - hash = "sha256-Ikca+3BH14YYSQRyESaU7zXekxsiOq16iGKiXBcOpMU="; + hash = "sha256-++GyVa6WaZw30apjqsBeZcCdaYMiUDaf1db6fxzHfiI="; }; build-system = [ hatchling ]; From a062ac6888af5ad626a04ee39f14670a244b2aef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 13:40:28 +0000 Subject: [PATCH 25/66] mediawriter: 5.2.4 -> 5.2.5 --- pkgs/by-name/me/mediawriter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/mediawriter/package.nix b/pkgs/by-name/me/mediawriter/package.nix index b9010986ca08..a127b4263d4f 100644 --- a/pkgs/by-name/me/mediawriter/package.nix +++ b/pkgs/by-name/me/mediawriter/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mediawriter"; - version = "5.2.4"; + version = "5.2.5"; src = fetchFromGitHub { owner = "FedoraQt"; repo = "MediaWriter"; tag = version; - hash = "sha256-UNbsq5V03QiSUIDuGcUxgf7+B8BWPkqgE1By/9huQOo="; + hash = "sha256-acKLKnAXTp1w8+pPVXO2gCi3GELEi3skYCYN13QjWyY="; }; nativeBuildInputs = [ From 21ef8841700a2cfd74861344fddc488a814127aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 22:11:29 +0000 Subject: [PATCH 26/66] meshcentral: 1.1.43 -> 1.1.44 --- pkgs/tools/admin/meshcentral/default.nix | 8 +- pkgs/tools/admin/meshcentral/package.json | 2 +- pkgs/tools/admin/meshcentral/yarn.lock | 440 +++++++++++----------- 3 files changed, 226 insertions(+), 224 deletions(-) diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index f9eca2fc6a75..244dd0acd107 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -8,11 +8,11 @@ }: yarn2nix-moretea.mkYarnPackage { - version = "1.1.43"; + version = "1.1.44"; src = fetchzip { - url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.43.tgz"; - sha256 = "0y6bqg03l0p0mkmmk6vh82gxjzsx1mkvjzwpyayrryn3hjaaih4k"; + url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.44.tgz"; + sha256 = "1rjn608czjn0f066wgakdzkz73wx0lrinrqs83j44h49qfqwxkl3"; }; patches = [ @@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage { offlineCache = fetchYarnDeps { yarnLock = ./yarn.lock; - hash = "sha256-dkR48KS5Ykh/3RyTuzOQ9dUXLBhhIT0KYGIXTn+CUKA="; + hash = "sha256-WltJXI9hd2OIRuPrqjDoCsa6/zjRGydPYCeiVxZIcS8="; }; # Tarball has CRLF line endings. This makes patching difficult, so let's convert them. diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json index 412495c43de0..213cb7460e26 100644 --- a/pkgs/tools/admin/meshcentral/package.json +++ b/pkgs/tools/admin/meshcentral/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "1.1.43", + "version": "1.1.44", "keywords": [ "Remote Device Management", "Remote Device Monitoring", diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock index 82ccbe4cde7e..11e7b0199e46 100644 --- a/pkgs/tools/admin/meshcentral/yarn.lock +++ b/pkgs/tools/admin/meshcentral/yarn.lock @@ -48,24 +48,24 @@ "@smithy/util-utf8" "^2.0.0" tslib "^2.6.2" -"@aws-sdk/client-cognito-identity@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.775.0.tgz#2be72dd874f22fc9cb8a5ce9a1aefff4a658241e" - integrity sha512-AMGywI8C+kcSTWjftq9jgzkospF1A/QNd/h6zN+3uuS+3rZhkPIoPCpaQ0NSTYD49FTq8ALZzNKTqTEOnp+txA== +"@aws-sdk/client-cognito-identity@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.796.0.tgz#8dcb4cb37789f887ed77e3fdcae8cfe1fff6cada" + integrity sha512-p8ZzHICnQaCL4oS16yHUCLH6/VkbmWP8p2P7vALncUYguHDE/oNcWNAARo56x3Qx0TbRCi0OD4KAwD6AhddMdg== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.775.0" - "@aws-sdk/credential-provider-node" "3.775.0" + "@aws-sdk/core" "3.796.0" + "@aws-sdk/credential-provider-node" "3.796.0" "@aws-sdk/middleware-host-header" "3.775.0" "@aws-sdk/middleware-logger" "3.775.0" "@aws-sdk/middleware-recursion-detection" "3.775.0" - "@aws-sdk/middleware-user-agent" "3.775.0" + "@aws-sdk/middleware-user-agent" "3.796.0" "@aws-sdk/region-config-resolver" "3.775.0" "@aws-sdk/types" "3.775.0" - "@aws-sdk/util-endpoints" "3.775.0" + "@aws-sdk/util-endpoints" "3.787.0" "@aws-sdk/util-user-agent-browser" "3.775.0" - "@aws-sdk/util-user-agent-node" "3.775.0" + "@aws-sdk/util-user-agent-node" "3.796.0" "@smithy/config-resolver" "^4.1.0" "@smithy/core" "^3.2.0" "@smithy/fetch-http-handler" "^5.0.2" @@ -93,23 +93,23 @@ "@smithy/util-utf8" "^4.0.0" tslib "^2.6.2" -"@aws-sdk/client-sso@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.775.0.tgz#3b2af9433f4f9925d0031bf213525dc11a8263c7" - integrity sha512-vqG1S2ap77WP4D5qt4bEPE0duQ4myN+cDr1NeP8QpSTajetbkDGVo7h1VViYMcUoFUVWBj6Qf1X1VfOq+uaxbA== +"@aws-sdk/client-sso@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.796.0.tgz#231fc98bd71c5e915e9060fba871a6d9d9ccb3d6" + integrity sha512-EJExg8mbwqP0VG+RNFV4ZPuUo7QsDsUfTnuFQY51V8iXrbOdV+PDLRr4psXj2fxvrLxc9AlGUMNqd/j4VZtQzA== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.775.0" + "@aws-sdk/core" "3.796.0" "@aws-sdk/middleware-host-header" "3.775.0" "@aws-sdk/middleware-logger" "3.775.0" "@aws-sdk/middleware-recursion-detection" "3.775.0" - "@aws-sdk/middleware-user-agent" "3.775.0" + "@aws-sdk/middleware-user-agent" "3.796.0" "@aws-sdk/region-config-resolver" "3.775.0" "@aws-sdk/types" "3.775.0" - "@aws-sdk/util-endpoints" "3.775.0" + "@aws-sdk/util-endpoints" "3.787.0" "@aws-sdk/util-user-agent-browser" "3.775.0" - "@aws-sdk/util-user-agent-node" "3.775.0" + "@aws-sdk/util-user-agent-node" "3.796.0" "@smithy/config-resolver" "^4.1.0" "@smithy/core" "^3.2.0" "@smithy/fetch-http-handler" "^5.0.2" @@ -137,51 +137,51 @@ "@smithy/util-utf8" "^4.0.0" tslib "^2.6.2" -"@aws-sdk/core@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.775.0.tgz#5d22ba78f07c07b48fb4d5b18172b9a896c0cbd0" - integrity sha512-8vpW4WihVfz0DX+7WnnLGm3GuQER++b0IwQG35JlQMlgqnc44M//KbJPsIHA0aJUJVwJAEShgfr5dUbY8WUzaA== +"@aws-sdk/core@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.796.0.tgz#6076b78772c1eb97ec6ea9064c85ce500e0aa889" + integrity sha512-tH8Sp7lCxISVoLnkyv4AouuXs2CDlMhTuesWa0lq2NX1f+DXsMwSBtN37ttZdpFMw3F8mWdsJt27X9h2Oq868A== dependencies: "@aws-sdk/types" "3.775.0" "@smithy/core" "^3.2.0" "@smithy/node-config-provider" "^4.0.2" "@smithy/property-provider" "^4.0.2" "@smithy/protocol-http" "^5.1.0" - "@smithy/signature-v4" "^5.0.2" + "@smithy/signature-v4" "^5.1.0" "@smithy/smithy-client" "^4.2.0" "@smithy/types" "^4.2.0" "@smithy/util-middleware" "^4.0.2" fast-xml-parser "4.4.1" tslib "^2.6.2" -"@aws-sdk/credential-provider-cognito-identity@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.775.0.tgz#d77403cf50aba0690c848903dd442368a401f479" - integrity sha512-fcyZzoCFp2u4NWXW8INA81kEEsWC7ZFzy5m/6t2RF1Gjt+1n2AlFQVqF73LeyEcaN+biNKq87kh94Btk0QdfHA== +"@aws-sdk/credential-provider-cognito-identity@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.796.0.tgz#c037d35d8a8284fc4cc658da9e7a2498f3703f1f" + integrity sha512-plvMsQNWW1Jq7YRs8S6xHEbdn+kO/F+vDjCBrPaT4LhcDMsXqO/jcDNRuYOnPRBQsqjp7n7MM3oMhyY4fupa6g== dependencies: - "@aws-sdk/client-cognito-identity" "3.775.0" + "@aws-sdk/client-cognito-identity" "3.796.0" "@aws-sdk/types" "3.775.0" "@smithy/property-provider" "^4.0.2" "@smithy/types" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-env@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.775.0.tgz#b8c81818f4c62d89b5f04dc410ab9b48e954f22c" - integrity sha512-6ESVxwCbGm7WZ17kY1fjmxQud43vzJFoLd4bmlR+idQSWdqlzGDYdcfzpjDKTcivdtNrVYmFvcH1JBUwCRAZhw== +"@aws-sdk/credential-provider-env@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.796.0.tgz#4ed6903814868b0f9daa8c8db449b1f1adcda041" + integrity sha512-kQzGKm4IOYYO6vUrai2JocNwhJm4Aml2BsAV+tBhFhhkutE7khf9PUucoVjB78b0J48nF+kdSacqzY+gB81/Uw== dependencies: - "@aws-sdk/core" "3.775.0" + "@aws-sdk/core" "3.796.0" "@aws-sdk/types" "3.775.0" "@smithy/property-provider" "^4.0.2" "@smithy/types" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-http@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.775.0.tgz#0fbc7f4e6cada37fc9b647de0d7c12a42a44bcc6" - integrity sha512-PjDQeDH/J1S0yWV32wCj2k5liRo0ssXMseCBEkCsD3SqsU8o5cU82b0hMX4sAib/RkglCSZqGO0xMiN0/7ndww== +"@aws-sdk/credential-provider-http@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.796.0.tgz#7f36074021b2605dba4b758b4b0ca98fb5b965ad" + integrity sha512-wWOT6VAHIKOuHdKFGm1iyKvx7f6+Kc/YTzFWJPuT+l+CPlXR6ylP1UMIDsHHLKpMzsrh3CH77QDsjkhQrnKkfg== dependencies: - "@aws-sdk/core" "3.775.0" + "@aws-sdk/core" "3.796.0" "@aws-sdk/types" "3.775.0" "@smithy/fetch-http-handler" "^5.0.2" "@smithy/node-http-handler" "^4.0.4" @@ -192,18 +192,18 @@ "@smithy/util-stream" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-ini@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.775.0.tgz#64be57d4ef2a2ca9a685255969a5989759042f55" - integrity sha512-0gJc6cALsgrjeC5U3qDjbz4myIC/j49+gPz9nkvY+C0OYWt1KH1tyfiZUuCRGfuFHhQ+3KMMDSL229TkBP3E7g== +"@aws-sdk/credential-provider-ini@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.796.0.tgz#6d5f260b93104b126e26919287a4e131d1cb8e75" + integrity sha512-qGWBDn9aO8avFfYU7daps7Sy6OglF1x0q0w48slt0KMXbHd2/LvKVIiYwyofYCXed0yzcEOF2IYm9FjXdcn+ug== dependencies: - "@aws-sdk/core" "3.775.0" - "@aws-sdk/credential-provider-env" "3.775.0" - "@aws-sdk/credential-provider-http" "3.775.0" - "@aws-sdk/credential-provider-process" "3.775.0" - "@aws-sdk/credential-provider-sso" "3.775.0" - "@aws-sdk/credential-provider-web-identity" "3.775.0" - "@aws-sdk/nested-clients" "3.775.0" + "@aws-sdk/core" "3.796.0" + "@aws-sdk/credential-provider-env" "3.796.0" + "@aws-sdk/credential-provider-http" "3.796.0" + "@aws-sdk/credential-provider-process" "3.796.0" + "@aws-sdk/credential-provider-sso" "3.796.0" + "@aws-sdk/credential-provider-web-identity" "3.796.0" + "@aws-sdk/nested-clients" "3.796.0" "@aws-sdk/types" "3.775.0" "@smithy/credential-provider-imds" "^4.0.2" "@smithy/property-provider" "^4.0.2" @@ -211,17 +211,17 @@ "@smithy/types" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-node@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.775.0.tgz#cfa9e4135d8480a38aa1e7590fac809fe6030703" - integrity sha512-D8Zre5W2sXC/ANPqCWPqwYpU1cKY9DF6ckFZyDrqlcBC0gANgpY6fLrBtYo2fwJsbj+1A24iIpBINV7erdprgA== +"@aws-sdk/credential-provider-node@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.796.0.tgz#aa621e4f15d7317b351c1dbb896bfcabbc21db0c" + integrity sha512-WeNK7OWPrsOvhO3DAgpUO0FtmVghMaZ/IpPJHJ4Y0nBIsWOBXLrbZ2Y1mdT8N2bGGUaM91tJaV8Yf8COc3gvmA== dependencies: - "@aws-sdk/credential-provider-env" "3.775.0" - "@aws-sdk/credential-provider-http" "3.775.0" - "@aws-sdk/credential-provider-ini" "3.775.0" - "@aws-sdk/credential-provider-process" "3.775.0" - "@aws-sdk/credential-provider-sso" "3.775.0" - "@aws-sdk/credential-provider-web-identity" "3.775.0" + "@aws-sdk/credential-provider-env" "3.796.0" + "@aws-sdk/credential-provider-http" "3.796.0" + "@aws-sdk/credential-provider-ini" "3.796.0" + "@aws-sdk/credential-provider-process" "3.796.0" + "@aws-sdk/credential-provider-sso" "3.796.0" + "@aws-sdk/credential-provider-web-identity" "3.796.0" "@aws-sdk/types" "3.775.0" "@smithy/credential-provider-imds" "^4.0.2" "@smithy/property-provider" "^4.0.2" @@ -229,63 +229,65 @@ "@smithy/types" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-process@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.775.0.tgz#7ab90383f12461c5d20546e933924e654660542b" - integrity sha512-A6k68H9rQp+2+7P7SGO90Csw6nrUEm0Qfjpn9Etc4EboZhhCLs9b66umUsTsSBHus4FDIe5JQxfCUyt1wgNogg== +"@aws-sdk/credential-provider-process@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.796.0.tgz#d22d8adf73985fb218ff74365cd86b71bbd64513" + integrity sha512-r4e8/4AdKn/qQbRVocW7oXkpoiuXdTv0qty8AASNLnbQnT1vjD1bvmP6kp4fbHPWgwY8I9h0Dqjp49uy9Bqyuw== dependencies: - "@aws-sdk/core" "3.775.0" + "@aws-sdk/core" "3.796.0" "@aws-sdk/types" "3.775.0" "@smithy/property-provider" "^4.0.2" "@smithy/shared-ini-file-loader" "^4.0.2" "@smithy/types" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-sso@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.775.0.tgz#fb0267025981b8d0b7ba55fdfb18742759708d64" - integrity sha512-du06V7u9HDmRuwZnRjf85shO3dffeKOkQplV5/2vf3LgTPNEI9caNomi/cCGyxKGOeSUHAKrQ1HvpPfOaI6t5Q== +"@aws-sdk/credential-provider-sso@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.796.0.tgz#db9081637747162ed8c5b29c61a98b898eea3e99" + integrity sha512-RUYsQ1t6UdzkpZ7pocUt1l/9l9GCYCaopIhv0DU6CipA8rkWtoweKsLHKdv+8wE4p6gqDfDIHGam1ivswiCIzg== dependencies: - "@aws-sdk/client-sso" "3.775.0" - "@aws-sdk/core" "3.775.0" - "@aws-sdk/token-providers" "3.775.0" + "@aws-sdk/client-sso" "3.796.0" + "@aws-sdk/core" "3.796.0" + "@aws-sdk/token-providers" "3.796.0" "@aws-sdk/types" "3.775.0" "@smithy/property-provider" "^4.0.2" "@smithy/shared-ini-file-loader" "^4.0.2" "@smithy/types" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-web-identity@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.775.0.tgz#d0db1b0bc37c95c99d3728c71bbe76b734704e12" - integrity sha512-z4XLYui5aHsr78mbd5BtZfm55OM5V55qK/X17OPrEqjYDDk3GlI8Oe2ZjTmOVrKwMpmzXKhsakeFHKfDyOvv1A== +"@aws-sdk/credential-provider-web-identity@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.796.0.tgz#8d19749fcf28f6603bb26a402f3f8e24797c35ba" + integrity sha512-dpmFJT4IyjT09vruvMu/rWQQjVreqdxAe8pLPpGhoeKyA1O6+PS73b+VNXKvD31rQT8e4g6dVpA6KMxNW63aag== dependencies: - "@aws-sdk/core" "3.775.0" - "@aws-sdk/nested-clients" "3.775.0" + "@aws-sdk/core" "3.796.0" + "@aws-sdk/nested-clients" "3.796.0" "@aws-sdk/types" "3.775.0" "@smithy/property-provider" "^4.0.2" "@smithy/types" "^4.2.0" tslib "^2.6.2" "@aws-sdk/credential-providers@^3.186.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.775.0.tgz#63567b6bdc04463b92e9cfa8926e7383e28ab0df" - integrity sha512-THvyeStdvd0z8Dv1lJ7KrMRiZkFfUktYQUvvFT45ph14jHC5oRoPColtLHz4JjuDN5QEQ5EGrbc6USADZu1k/w== + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.796.0.tgz#60a9544366a08e6e6dc69625a668cfd12b6501d9" + integrity sha512-thZw44Bk3pS0PW81QmPfNSliX5XfXHDlWRjPYHBx+eTlPtidyD5klJkkfF5fkQlpHPeP2KNLuRnr6bRu+uMirg== dependencies: - "@aws-sdk/client-cognito-identity" "3.775.0" - "@aws-sdk/core" "3.775.0" - "@aws-sdk/credential-provider-cognito-identity" "3.775.0" - "@aws-sdk/credential-provider-env" "3.775.0" - "@aws-sdk/credential-provider-http" "3.775.0" - "@aws-sdk/credential-provider-ini" "3.775.0" - "@aws-sdk/credential-provider-node" "3.775.0" - "@aws-sdk/credential-provider-process" "3.775.0" - "@aws-sdk/credential-provider-sso" "3.775.0" - "@aws-sdk/credential-provider-web-identity" "3.775.0" - "@aws-sdk/nested-clients" "3.775.0" + "@aws-sdk/client-cognito-identity" "3.796.0" + "@aws-sdk/core" "3.796.0" + "@aws-sdk/credential-provider-cognito-identity" "3.796.0" + "@aws-sdk/credential-provider-env" "3.796.0" + "@aws-sdk/credential-provider-http" "3.796.0" + "@aws-sdk/credential-provider-ini" "3.796.0" + "@aws-sdk/credential-provider-node" "3.796.0" + "@aws-sdk/credential-provider-process" "3.796.0" + "@aws-sdk/credential-provider-sso" "3.796.0" + "@aws-sdk/credential-provider-web-identity" "3.796.0" + "@aws-sdk/nested-clients" "3.796.0" "@aws-sdk/types" "3.775.0" + "@smithy/config-resolver" "^4.1.0" "@smithy/core" "^3.2.0" "@smithy/credential-provider-imds" "^4.0.2" + "@smithy/node-config-provider" "^4.0.2" "@smithy/property-provider" "^4.0.2" "@smithy/types" "^4.2.0" tslib "^2.6.2" @@ -319,36 +321,36 @@ "@smithy/types" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/middleware-user-agent@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.775.0.tgz#66950672df55ddb32062baa4d92c67b3b67dfa65" - integrity sha512-7Lffpr1ptOEDE1ZYH1T78pheEY1YmeXWBfFt/amZ6AGsKSLG+JPXvof3ltporTGR2bhH/eJPo7UHCglIuXfzYg== +"@aws-sdk/middleware-user-agent@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.796.0.tgz#80149d7f9034d41d35de88d96a6b73c1cb06413b" + integrity sha512-IeNg+3jNWT37J45opi5Jx89hGF0lOnZjiNwlMp3rKq7PlOqy8kWq5J1Gxk0W3tIkPpuf68CtBs/QFrRXWOjsZw== dependencies: - "@aws-sdk/core" "3.775.0" + "@aws-sdk/core" "3.796.0" "@aws-sdk/types" "3.775.0" - "@aws-sdk/util-endpoints" "3.775.0" + "@aws-sdk/util-endpoints" "3.787.0" "@smithy/core" "^3.2.0" "@smithy/protocol-http" "^5.1.0" "@smithy/types" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/nested-clients@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.775.0.tgz#abf064391a0b967ad44a4657d6ffcea729f9014d" - integrity sha512-f37jmAzkuIhKyhtA6s0LGpqQvm218vq+RNMUDkGm1Zz2fxJ5pBIUTDtygiI3vXTcmt9DTIB8S6JQhjrgtboktw== +"@aws-sdk/nested-clients@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.796.0.tgz#f13f3bd87b923561348394ac6a9010d74334cb7c" + integrity sha512-jJ8a0ldWtXh/ice7nldUjTqja7KYlSYk1pwfIIvJLIqEn2SvQHK/pyCINTmmOmFAWXMKBQBeWUMxo1pPYNytzQ== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.775.0" + "@aws-sdk/core" "3.796.0" "@aws-sdk/middleware-host-header" "3.775.0" "@aws-sdk/middleware-logger" "3.775.0" "@aws-sdk/middleware-recursion-detection" "3.775.0" - "@aws-sdk/middleware-user-agent" "3.775.0" + "@aws-sdk/middleware-user-agent" "3.796.0" "@aws-sdk/region-config-resolver" "3.775.0" "@aws-sdk/types" "3.775.0" - "@aws-sdk/util-endpoints" "3.775.0" + "@aws-sdk/util-endpoints" "3.787.0" "@aws-sdk/util-user-agent-browser" "3.775.0" - "@aws-sdk/util-user-agent-node" "3.775.0" + "@aws-sdk/util-user-agent-node" "3.796.0" "@smithy/config-resolver" "^4.1.0" "@smithy/core" "^3.2.0" "@smithy/fetch-http-handler" "^5.0.2" @@ -388,12 +390,12 @@ "@smithy/util-middleware" "^4.0.2" tslib "^2.6.2" -"@aws-sdk/token-providers@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.775.0.tgz#0d2128b2c8985731dcf592c5b9334654ddd0556b" - integrity sha512-Q6MtbEhkOggVSz/dN89rIY/ry80U3v89o0Lrrc+Rpvaiaaz8pEN0DsfEcg0IjpzBQ8Owoa6lNWyglHbzPhaJpA== +"@aws-sdk/token-providers@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.796.0.tgz#c31f1d522a1df01ecf3780e72de67d2fc0c8787b" + integrity sha512-Sxr/EqJBxOwLsXHv8C91N/Aao8Rgjn5bcpzplrTZ7wrfDrzqQfSCvjh7apCxdLYMKPBV+an75blCAd7JD4/bAg== dependencies: - "@aws-sdk/nested-clients" "3.775.0" + "@aws-sdk/nested-clients" "3.796.0" "@aws-sdk/types" "3.775.0" "@smithy/property-provider" "^4.0.2" "@smithy/shared-ini-file-loader" "^4.0.2" @@ -408,10 +410,10 @@ "@smithy/types" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/util-endpoints@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.775.0.tgz#2f6fd728c86aeb1fba38506161b2eb024de17c19" - integrity sha512-yjWmUgZC9tUxAo8Uaplqmq0eUh0zrbZJdwxGRKdYxfm4RG6fMw1tj52+KkatH7o+mNZvg1GDcVp/INktxonJLw== +"@aws-sdk/util-endpoints@3.787.0": + version "3.787.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.787.0.tgz#1398f0bd87f19e615ae920c73e16d9d5e5cb76d1" + integrity sha512-fd3zkiOkwnbdbN0Xp9TsP5SWrmv0SpT70YEdbb8wAj2DWQwiCmFszaSs+YCvhoCdmlR3Wl9Spu0pGpSAGKeYvQ== dependencies: "@aws-sdk/types" "3.775.0" "@smithy/types" "^4.2.0" @@ -435,12 +437,12 @@ bowser "^2.11.0" tslib "^2.6.2" -"@aws-sdk/util-user-agent-node@3.775.0": - version "3.775.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.775.0.tgz#dbc34ff2d84e2c3d10466081cad005d49c3d9740" - integrity sha512-N9yhTevbizTOMo3drH7Eoy6OkJ3iVPxhV7dwb6CMAObbLneS36CSfA6xQXupmHWcRvZPTz8rd1JGG3HzFOau+g== +"@aws-sdk/util-user-agent-node@3.796.0": + version "3.796.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.796.0.tgz#72c2ea1f32d2eb1200e111f48fd8a3c005f5202c" + integrity sha512-9fQpNcHgVFitf1tbTT8V1xGRoRHSmOAWjrhevo6Tc0WoINMAKz+4JNqfVGWRE5Tmtpq0oHKo1RmvxXQQtJYciA== dependencies: - "@aws-sdk/middleware-user-agent" "3.775.0" + "@aws-sdk/middleware-user-agent" "3.796.0" "@aws-sdk/types" "3.775.0" "@smithy/node-config-provider" "^4.0.2" "@smithy/types" "^4.2.0" @@ -850,19 +852,19 @@ resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-4.0.0.tgz#d600e0433daf51b88c1fa95ac7f02e38e80a07be" integrity sha512-MmaX6HeSvyPbWGwFq7mXdo0uQZLGBYCwziiLIGq5JVX+/bdI3SAq6bP98trV5eTWfLuvsMcIC1YJOF2vfteLFA== -"@google-cloud/promisify@^4.0.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-4.1.0.tgz#df8b060f0121c6462233f5420738dcda09c6df4a" - integrity sha512-G/FQx5cE/+DqBbOpA5jKsegGwdPniU6PuIEMt+qxWgFxvxuFOzVmp6zYchtYuwAWV5/8Dgs0yAmjvNZv3uXLQg== +"@google-cloud/promisify@<4.1.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-4.0.0.tgz#a906e533ebdd0f754dca2509933334ce58b8c8b1" + integrity sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g== "@google-cloud/storage@^7.7.0": - version "7.15.2" - resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-7.15.2.tgz#5371767d78064d4fec259594520be38f5f02ab06" - integrity sha512-+2k+mcQBb9zkaXMllf2wwR/rI07guAx+eZLWsGTDihW2lJRGfiqB7xu1r7/s4uvSP/T+nAumvzT5TTscwHKJ9A== + version "7.16.0" + resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-7.16.0.tgz#62c04ee4f80190992ef06cb033a90c054bcea575" + integrity sha512-7/5LRgykyOfQENcm6hDKP8SX/u9XxE5YOiWOkgkwcoO+cG8xT/cyOvp9wwN3IxfdYgpHs8CE7Nq2PKX2lNaEXw== dependencies: "@google-cloud/paginator" "^5.0.0" "@google-cloud/projectify" "^4.0.0" - "@google-cloud/promisify" "^4.0.0" + "@google-cloud/promisify" "<4.1.0" abort-controller "^3.0.0" async-retry "^1.3.3" duplexify "^4.1.3" @@ -877,17 +879,17 @@ uuid "^8.0.0" "@grpc/grpc-js@^1.10.9": - version "1.13.1" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.13.1.tgz#0fdd678dddc0d64d958ba7b420652fe62180ed50" - integrity sha512-z5nNuIs75S73ZULjPDe5QCNTiCv7FyBZXEVWOyAHtcebnuJf0g1SuueI3U1/z/KK39XyAQRUC+C9ZQJOtgHynA== + version "1.13.3" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.13.3.tgz#6ad08d186c2a8651697085f790c5c68eaca45904" + integrity sha512-FTXHdOoPbZrBjlVLHuKbDZnsTxXv2BlHF57xw6LuThXacXvtkahEPED0CKMk6obZDf65Hv4k3z62eyPNpvinIg== dependencies: "@grpc/proto-loader" "^0.7.13" "@js-sdsl/ordered-map" "^4.4.2" "@grpc/proto-loader@^0.7.13": - version "0.7.13" - resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.13.tgz#f6a44b2b7c9f7b609f5748c6eac2d420e37670cf" - integrity sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw== + version "0.7.15" + resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.15.tgz#4cdfbf35a35461fc843abe8b9e2c0770b5095e60" + integrity sha512-tMXdRCfYVixjuFK+Hk0Q1s38gV9zDiDJfWL3h1rv4Qc39oILCu1TRTDt7+fGUI8K4G1Fj125Hx/ru3azECWTyQ== dependencies: lodash.camelcase "^4.3.0" long "^5.0.0" @@ -1144,13 +1146,13 @@ localforage "^1.9.0" util "^0.12.4" -"@sendgrid/client@^8.1.4": - version "8.1.4" - resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-8.1.4.tgz#4db39e49d8ed732169d73b5d5c94d2b11907970d" - integrity sha512-VxZoQ82MpxmjSXLR3ZAE2OWxvQIW2k2G24UeRPr/SYX8HqWLV/8UBN15T2WmjjnEb5XSmFImTJOKDzzSeKr9YQ== +"@sendgrid/client@^8.1.5": + version "8.1.5" + resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-8.1.5.tgz#e6586c1ea02ec587b393c1f2a63d9eec8c94e34d" + integrity sha512-Jqt8aAuGIpWGa15ZorTWI46q9gbaIdQFA21HIPQQl60rCjzAko75l3D1z7EyjFrNr4MfQ0StusivWh8Rjh10Cg== dependencies: "@sendgrid/helpers" "^8.0.0" - axios "^1.7.4" + axios "^1.8.2" "@sendgrid/helpers@^8.0.0": version "8.0.0" @@ -1160,11 +1162,11 @@ deepmerge "^4.2.2" "@sendgrid/mail@*": - version "8.1.4" - resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-8.1.4.tgz#0ba72906685eae1a1ef990cca31e962f1ece6928" - integrity sha512-MUpIZykD9ARie8LElYCqbcBhGGMaA/E6I7fEcG7Hc2An26QJyLtwOaKQ3taGp8xO8BICPJrSKuYV4bDeAJKFGQ== + version "8.1.5" + resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-8.1.5.tgz#995ef96aaf4664d2f059ec6ca38f79f724d350f2" + integrity sha512-W+YuMnkVs4+HA/bgfto4VHKcPKLc7NiZ50/NH2pzO6UHCCFuq8/GNB98YJlLEr/ESDyzAaDr7lVE7hoBwFTT3Q== dependencies: - "@sendgrid/client" "^8.1.4" + "@sendgrid/client" "^8.1.5" "@sendgrid/helpers" "^8.0.0" "@sideway/address@^4.1.5": @@ -1394,10 +1396,10 @@ "@smithy/types" "^4.2.0" tslib "^2.6.2" -"@smithy/signature-v4@^5.0.2": - version "5.0.2" - resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.0.2.tgz#363854e946fbc5bc206ff82e79ada5d5c14be640" - integrity sha512-Mz+mc7okA73Lyz8zQKJNyr7lIcHLiPYp0+oiqiMNc/t7/Kf2BENs5d63pEj7oPqdjaum6g0Fc8wC78dY1TgtXw== +"@smithy/signature-v4@^5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.1.0.tgz#2c56e5b278482b04383d84ea2c07b7f0a8eb8f63" + integrity sha512-4t5WX60sL3zGJF/CtZsUQTs3UrZEDO2P7pEaElrekbLqkWPYkgqNW1oeiNYC6xXifBnT9dVBOnNQRvOE9riU9w== dependencies: "@smithy/is-array-buffer" "^4.0.0" "@smithy/protocol-http" "^5.1.0" @@ -1673,11 +1675,11 @@ integrity sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA== "@types/node@*", "@types/node@>=13.7.0", "@types/node@^22.0.1", "@types/node@^22.5.4": - version "22.13.13" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.13.13.tgz#5e7d110fb509b0d4a43fbf48fa9d6e0f83e1b1e7" - integrity sha512-ClsL5nMwKaBRwPcCvH8E7+nU4GxHVx1axNvMZTFHMEfNI7oahimt26P5zjVCRrjiIWj6YFXfE1v3dEp94wLcGQ== + version "22.15.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.15.0.tgz#5fcf430c079da64e96028b87cbffc218a02685db" + integrity sha512-99S8dWD2DkeE6PBaEDw+In3aar7hdoBvjyJMR6vaKBTzpvR0P00ClzJMOoVrj9D2+Sy/YCwACYHnBTpMhg1UCA== dependencies: - undici-types "~6.20.0" + undici-types "~6.21.0" "@types/node@^14.14.14": version "14.18.63" @@ -1745,9 +1747,9 @@ "@types/webidl-conversions" "*" "@types/ws@^8.5.3": - version "8.18.0" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.18.0.tgz#8a2ec491d6f0685ceaab9a9b7ff44146236993b5" - integrity sha512-8svvI3hMyvN0kKCJMvTJP/x6Y/EoQbepff882wL+Sn5QsXb3etnamgrJq4isrBxSJj5L2AuXcI0+bgkoAXGUJw== + version "8.18.1" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.18.1.tgz#48464e4bf2ddfd17db13d845467f6070ffea4aa9" + integrity sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg== dependencies: "@types/node" "*" @@ -2009,9 +2011,9 @@ accepts@~1.3.8: negotiator "0.6.3" acebase-core@^1.27.5: - version "1.27.5" - resolved "https://registry.yarnpkg.com/acebase-core/-/acebase-core-1.27.5.tgz#58697bdeae60250d009619b07fb60fe8a8123d0e" - integrity sha512-mogTRyHg+5/TYp6puXcdhTUmupPLGyWSBpzf/1gXANEk/QffaPvEFGzolJ5fTIVFl3UhVoYcUj2jEDbQHmGGMQ== + version "1.28.1" + resolved "https://registry.yarnpkg.com/acebase-core/-/acebase-core-1.28.1.tgz#a99ee78a5a142d8aee59d06d4faa093999cb8cba" + integrity sha512-WfYdG3aeZag+p+wXgKpVNfu9FubuZenW5VDPtUP/qIlac1io+AWuctI5JNuG/plNkpNaTJjujoeTE9z6+Y3HnQ== optionalDependencies: rxjs ">= 5.x <= 7.x" @@ -2400,10 +2402,10 @@ axios@^0.27.2: follow-redirects "^1.14.9" form-data "^4.0.0" -axios@^1.2.2, axios@^1.7.4: - version "1.8.4" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.4.tgz#78990bb4bc63d2cae072952d374835950a82f447" - integrity sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw== +axios@^1.2.2, axios@^1.8.2: + version "1.9.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.9.0.tgz#25534e3b72b54540077d33046f77e3b8d7081901" + integrity sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg== dependencies: follow-redirects "^1.15.6" form-data "^4.0.0" @@ -2494,9 +2496,9 @@ big-integer@^1.6.48: integrity sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg== bignumber.js@^9.0.0, bignumber.js@^9.0.1: - version "9.1.2" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.2.tgz#b7c4242259c008903b13707983b5f4bbd31eda0c" - integrity sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug== + version "9.3.0" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.3.0.tgz#bdba7e2a4c1a2eba08290e8dcad4f36393c92acd" + integrity sha512-EM7aMFTXbptt/wZdMlBv2t8IViwQL+h6SLHosp8Yf0dqJMTnY6iL32opnAB6kAdL0SZPuvcAzFr31o0c/R3/RA== binary-extensions@^2.0.0: version "2.3.0" @@ -2783,9 +2785,9 @@ camelcase@^5.0.0: integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== caniuse-lite@^1.0.30001688: - version "1.0.30001707" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz#c5e104d199e6f4355a898fcd995a066c7eb9bf41" - integrity sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw== + version "1.0.30001715" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz#bd325a37ad366e3fe90827d74062807a34fbaeb2" + integrity sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw== caseless@~0.12.0: version "0.12.0" @@ -3384,14 +3386,14 @@ destroy@1.2.0: integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== detect-libc@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700" - integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw== + version "2.0.4" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.4.tgz#f04715b8ba815e53b4d8109655b6508a6865a7e8" + integrity sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA== discord-api-types@^0.37.114, discord-api-types@^0.37.119, discord-api-types@^0.37.12, discord-api-types@^0.37.41: - version "0.37.119" - resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.119.tgz#29e32f635351da32dd4c92defcafdeb65156ad33" - integrity sha512-WasbGFXEB+VQWXlo6IpW3oUv73Yuau1Ig4AZF/m13tXcTKnMpc/mHjpztIlz4+BM9FG9BHQkEXiPto3bKduQUg== + version "0.37.120" + resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.120.tgz#ad7209930509c4cee3efddbacc77a1b18cf66d34" + integrity sha512-7xpNK0EiWjjDFp2nAhHXezE4OUWm7s1zhc/UXXN6hnFFU8dfoPHgV0Hx0RPiCa3ILRpdeh152icc68DGCyXYIw== discord.js@14.6.0: version "14.6.0" @@ -3498,9 +3500,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.5.73: - version "1.5.123" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.123.tgz#fae5bdba0ba27045895176327aa79831aba0790c" - integrity sha512-refir3NlutEZqlKaBLK0tzlVLe5P2wDKS7UQt/3SpibizgsRAPOsqQC3ffw1nlv3ze5gjRQZYHoPymgVZkplFA== + version "1.5.142" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.142.tgz#1de55d0d19b24b07768c4bfc90f41bd7f248d043" + integrity sha512-Ah2HgkTu/9RhTDNThBtzu2Wirdy4DC9b0sMT1pUhbkZQ5U/iwmE+PHZX1MpjD5IkJCc2wSghgGG/B04szAx07w== emoji-regex@^7.0.1: version "7.0.3" @@ -3551,10 +3553,10 @@ entities@^2.0.0: resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== -entities@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" - integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== +entities@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-6.0.0.tgz#09c9e29cb79b0a6459a9b9db9efb418ac5bb8e51" + integrity sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw== env-paths@^2.2.0: version "2.2.1" @@ -4325,9 +4327,9 @@ google-auth-library@^9.0.0, google-auth-library@^9.3.0, google-auth-library@^9.6 jws "^4.0.0" google-gax@^4.3.3: - version "4.4.1" - resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-4.4.1.tgz#95a9cf7ee7777ac22d1926a45b5f886dd8beecae" - integrity sha512-Phyp9fMfA00J3sZbJxbbB4jC55b7DBjE3F6poyL3wKMEBVKA79q6BGuHcTiM28yOzVql0NDbRL8MLLh8Iwk9Dg== + version "4.6.0" + resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-4.6.0.tgz#455c94496d80ecf0cba113b0451a883b7bcee0fd" + integrity sha512-zKKLeLfcYBVOzzM48Brtn4EQkKcTli9w6c1ilzFK2NbJvcd4ATD8/XqFExImvE/W5IwMlKKwa5qqVufji3ioNQ== dependencies: "@grpc/grpc-js" "^1.10.9" "@grpc/proto-loader" "^0.7.13" @@ -4538,9 +4540,9 @@ html-encoding-sniffer@^3.0.0: whatwg-encoding "^2.0.0" html-entities@^2.5.2: - version "2.5.3" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.3.tgz#d8a0680bd24ee35af8c74d6d4b695627dde61c00" - integrity sha512-D3AfvN7SjhTgBSA8L1BN4FpPzuEd06uy4lHwSoRWr0lndi9BKaNzPLKGOWZ2ocSGguozr08TTb2jhCLHaemruw== + version "2.6.0" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.6.0.tgz#7c64f1ea3b36818ccae3d3fb48b6974208e984f8" + integrity sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ== html-escaper@^2.0.0: version "2.0.2" @@ -4598,9 +4600,9 @@ http-errors@~1.8.1: toidentifier "1.0.1" http-parser-js@>=0.5.1: - version "0.5.9" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.9.tgz#b817b3ca0edea6236225000d795378707c169cec" - integrity sha512-n1XsPy3rXVxlqxVioEWdC+0+M+SQw0DpJynwtOPo1X+ZlvdzTLtDBIJJlDQTnwZIFJrZSzSGmIOUdP8tu+SgLw== + version "0.5.10" + resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.10.tgz#b3277bd6d7ed5588e20ea73bf724fcbe44609075" + integrity sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA== http-proxy-agent@^4.0.1: version "4.0.1" @@ -5552,9 +5554,9 @@ logform@^2.7.0: triple-beam "^1.3.0" long@^5.0.0, long@^5.2.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/long/-/long-5.3.1.tgz#9d4222d3213f38a5ec809674834e0f0ab21abe96" - integrity sha512-ka87Jz3gcx/I7Hal94xaN2tZEOPoUOEVftkQqZx2EeQRN7LGdfLlI3FvZ+7WDplm+vK2Urx9ULrvSowtdCieng== + version "5.3.2" + resolved "https://registry.yarnpkg.com/long/-/long-5.3.2.tgz#1d84463095999262d7d7b7f8bfd4a8cc55167f83" + integrity sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA== lossless-json@2.0.1: version "2.0.1" @@ -6225,9 +6227,9 @@ number-is-nan@^1.0.0: integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ== nwsapi@^2.2.4: - version "2.2.19" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.19.tgz#586660f7c24c34691907002309a8dc28064c9c0b" - integrity sha512-94bcyI3RsqiZufXjkr3ltkI86iEl+I7uiHVDtcq9wJUTwYQJ5odHDeSzkkrRzi80jJ8MaeZgqKjH1bAWAFw9bA== + version "2.2.20" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.20.tgz#22e53253c61e7b0e7e93cef42c891154bcca11ef" + integrity sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA== nyc@^14.1.1: version "14.1.1" @@ -6500,11 +6502,11 @@ parse-passwd@^1.0.0: integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q== parse5@^7.1.2: - version "7.2.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.2.1.tgz#8928f55915e6125f430cc44309765bf17556a33a" - integrity sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ== + version "7.3.0" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.3.0.tgz#d7e224fa72399c7a175099f45fc2ad024b05ec05" + integrity sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw== dependencies: - entities "^4.5.0" + entities "^6.0.0" parseurl@~1.3.3: version "1.3.3" @@ -6671,14 +6673,14 @@ performance-now@^2.1.0: integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== pg-cloudflare@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz#e6d5833015b170e23ae819e8c5d7eaedb472ca98" - integrity sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q== + version "1.2.5" + resolved "https://registry.yarnpkg.com/pg-cloudflare/-/pg-cloudflare-1.2.5.tgz#2e3649c38a7a9c74a7e5327c8098a2fd9af595bd" + integrity sha512-OOX22Vt0vOSRrdoUPKJ8Wi2OpE/o/h9T8X1s4qSkCedbNah9ei2W2765be8iMVxQUsvgT7zIAT2eIa9fs5+vtg== pg-connection-string@^2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.7.0.tgz#f1d3489e427c62ece022dba98d5262efcb168b37" - integrity sha512-PI2W9mv53rXJQEOb8xNR8lH7Hr+EKa6oJa38zsK0S/ky2er16ios1wLKhZyxzD7jUReiWokc9WK5nxSnC7W1TA== + version "2.8.5" + resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.8.5.tgz#82cefd0269cb64a09603342d9b69e8392e6eb6cd" + integrity sha512-Ni8FuZ8yAF+sWZzojvtLE2b03cqjO5jNULcHFfM9ZZ0/JXrgom5pBREbtnAw7oxsxJqHw9Nz/XWORUEL3/IFow== pg-int8@1.0.1: version "1.0.1" @@ -6686,14 +6688,14 @@ pg-int8@1.0.1: integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw== pg-pool@^3.8.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.8.0.tgz#e6bce7fc4506a8d6106551363fc5283e5445b776" - integrity sha512-VBw3jiVm6ZOdLBTIcXLNdSotb6Iy3uOCwDGFAksZCXmi10nyRvnP2v3jl4d+IsLYRyXf6o9hIm/ZtUzlByNUdw== + version "3.9.5" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.9.5.tgz#73ee76bacc51f4bef5f9928a107ff15c98275fae" + integrity sha512-DxyAlOgvUzRFpFAZjbCc8fUfG7BcETDHgepFPf724B0i08k9PAiZV1tkGGgQIL0jbMEuR9jW1YN7eX+WgXxCsQ== pg-protocol@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.8.0.tgz#c707101dd07813868035a44571488e4b98639d48" - integrity sha512-jvuYlEkL03NRvOoyoRktBK7+qU5kOvlAwvmrH8sr3wbLrOdVWsRxQfz8mMy9sZFsqJ1hEWNfdWKI4SAmoL+j7g== + version "1.9.5" + resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.9.5.tgz#e544eff37d6ab79c26281d7c0b59ac9be4862686" + integrity sha512-DYTWtWpfd5FOro3UnAfwvhD8jh59r2ig8bPtc9H8Ds7MscE/9NYruUQWFAOuraRl29jwcT2kyMFQ3MxeaVjUhg== pg-types@^2.1.0: version "2.2.0" @@ -6747,9 +6749,9 @@ pify@^4.0.1: integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== pirates@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9" - integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg== + version "4.0.7" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.7.tgz#643b4a18c4257c8a65104b73f3049ce9a0a15e22" + integrity sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA== pkg-dir@^3.0.0: version "3.0.0" @@ -6892,9 +6894,9 @@ proto3-json-serializer@^2.0.2: protobufjs "^7.2.5" protobufjs@^7.2.5, protobufjs@^7.2.6, protobufjs@^7.3.2: - version "7.4.0" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.4.0.tgz#7efe324ce9b3b61c82aae5de810d287bc08a248a" - integrity sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw== + version "7.5.0" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.5.0.tgz#a317ad80713e9db43c8e55afa8636a9aa76bb630" + integrity sha512-Z2E/kOY1QjoMlCytmexzYfDm/w5fKAiRwpSzGtdnXW1zC88Z2yXazHHrOtwCzn+7wSxyE8PYM4rvVcMphF9sOA== dependencies: "@protobufjs/aspromise" "^1.1.2" "@protobufjs/base64" "^1.1.2" @@ -8432,10 +8434,10 @@ unbox-primitive@^1.1.0: has-symbols "^1.1.0" which-boxed-primitive "^1.1.1" -undici-types@~6.20.0: - version "6.20.0" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433" - integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg== +undici-types@~6.21.0: + version "6.21.0" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb" + integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ== undici@^5.11.0, undici@^5.22.0: version "5.29.0" From d2ea9e328a00d071013e1839433406df95e6c67f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 23:20:01 +0000 Subject: [PATCH 27/66] python312Packages.pyomo: 6.9.1 -> 6.9.2 --- pkgs/development/python-modules/pyomo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index edeb984839d4..6eb8eb26adf8 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyomo"; - version = "6.9.1"; + version = "6.9.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { repo = "pyomo"; owner = "pyomo"; tag = version; - hash = "sha256-sEbvQ6U8eSzDPE3kVCektt92dpVV9JhZ4tKDtlHX42s="; + hash = "sha256-LfrJmR5yHFZLONEdj6RCE2wsF6hRXUuHcrSJcJrELE8="; }; build-system = [ setuptools ]; From 0ababd8c5894414e20b0a36b7543a8eaad7f0c6b Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 25 Apr 2025 09:03:52 +0200 Subject: [PATCH 28/66] aws-workspaces: add missing shared folder Useful to get the `.desktop` file and related application icons --- pkgs/by-name/aw/aws-workspaces/package.nix | 29 +++++++++++----------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/aw/aws-workspaces/package.nix b/pkgs/by-name/aw/aws-workspaces/package.nix index 7de70180d089..bdcf2e63b8b8 100644 --- a/pkgs/by-name/aw/aws-workspaces/package.nix +++ b/pkgs/by-name/aw/aws-workspaces/package.nix @@ -1,6 +1,4 @@ { - stdenv, - lib, callPackage, writeShellApplication, buildFHSEnv, @@ -46,19 +44,18 @@ buildFHSEnv { includeClosures = true; - targetPkgs = - pkgs: with pkgs; [ - workspacesclient - custom_lsb_release - webkitgtk_4_1 - gtk3 - pango - atk - cairo - gdk-pixbuf - protobufc - cyrus_sasl - ]; + targetPkgs = pkgs: [ + workspacesclient + custom_lsb_release + webkitgtk_4_1 + gtk3 + pango + atk + cairo + gdk-pixbuf + protobufc + cyrus_sasl + ]; extraBwrapArgs = [ # provide certificates where Debian-style OpenSSL can find them @@ -68,6 +65,8 @@ buildFHSEnv { # expected executable doesn't match the name of this package extraInstallCommands = '' mv $out/bin/${pname} $out/bin/workspacesclient + + ln -s ${workspacesclient}/share $out/ ''; meta = workspacesclient.meta; From ad9ccb584a2bf0050504ed0e09b88be13fcb983c Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 25 Apr 2025 12:54:55 +0200 Subject: [PATCH 29/66] tiledb: update build dependencies --- pkgs/by-name/ti/tiledb/package.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ti/tiledb/package.nix b/pkgs/by-name/ti/tiledb/package.nix index 9de861f6204c..5454d074713a 100644 --- a/pkgs/by-name/ti/tiledb/package.nix +++ b/pkgs/by-name/ti/tiledb/package.nix @@ -8,7 +8,7 @@ bzip2, zstd, spdlog, - tbb, + tbb_2022_0, openssl, boost, libpqxx, @@ -22,7 +22,6 @@ libpng, file, runCommand, - catch2, useAVX2 ? stdenv.hostPlatform.avx2Support, }: @@ -32,6 +31,8 @@ let chmod -R +w $out cp -r ${rapidcheck.dev}/* $out ''; + catch2 = catch2_3; + tbb = tbb_2022_0; in stdenv.mkDerivation rec { pname = "tiledb"; @@ -67,7 +68,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional (!useAVX2) "-DCOMPILER_SUPPORTS_AVX2=FALSE"; nativeBuildInputs = [ - catch2_3 + catch2 clang-tools cmake python3 @@ -90,9 +91,6 @@ stdenv.mkDerivation rec { catch2 ]; - # fatal error: catch.hpp: No such file or directory - doCheck = false; - nativeCheckInputs = [ gtest catch2 From 9cd14670adb715ca1b1450af90dc5f843fae11a5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 25 Apr 2025 15:39:00 +0200 Subject: [PATCH 30/66] nixos/oci-containers: escape `login.username` When using e.g. GitLab as container registry, the token name may be the username. However, the token name can contain special characters including spaces breaking the registry login like this: Apr 25 15:35:48 test42 pre-start[294091]: image doesn't exist locally and login failed Apr 25 15:35:52 test42 pre-start[294289]: Error: accepts at most 1 arg(s), received 2 Apr 25 15:35:52 test42 pre-start[294297]: Error: registry.example.com/foo/bar/baz: image not known Applying `escapeShellArg` on it fixes the problem. --- nixos/modules/virtualisation/oci-containers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index d81246e31383..db7f9dd29ce0 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -416,7 +416,7 @@ let # try logging in, if it fails, check if image exists locally ${cfg.backend} login \ ${container.login.registry} \ - --username ${container.login.username} \ + --username ${escapeShellArg container.login.username} \ --password-stdin < ${container.login.passwordFile} \ || ${cfg.backend} image inspect ${container.image} >/dev/null \ || { echo "image doesn't exist locally and login failed" >&2 ; exit 1; } From 7a359d9cdd47f693486102e40d27b931068fdbc2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Apr 2025 13:51:50 +0000 Subject: [PATCH 31/66] python312Packages.langgraph-sdk: 0.1.61 -> 0.1.63 --- pkgs/development/python-modules/langgraph-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix index 563e0babce35..5cee300cf9de 100644 --- a/pkgs/development/python-modules/langgraph-sdk/default.nix +++ b/pkgs/development/python-modules/langgraph-sdk/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "langgraph-sdk"; - version = "0.1.61"; + version = "0.1.63"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "sdk==${version}"; - hash = "sha256-cwoJ/1D+oAxqt6DEmpRBxDiR2nRAqBIOfqwLOmgUcZQ="; + hash = "sha256-V+JrLcumPQwN5hqfxyNc3OavPLlCFY5kXO81DSaAbeA="; }; sourceRoot = "${src.name}/libs/sdk-py"; From 5300a9988a3ef4e746f80a1adfe788a4886ba09a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Apr 2025 14:01:41 +0000 Subject: [PATCH 32/66] python312Packages.langgraph: 0.3.31 -> 0.3.34 --- pkgs/development/python-modules/langgraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix index 1cc286b5ec8f..649aa7847219 100644 --- a/pkgs/development/python-modules/langgraph/default.nix +++ b/pkgs/development/python-modules/langgraph/default.nix @@ -38,14 +38,14 @@ }: buildPythonPackage rec { pname = "langgraph"; - version = "0.3.31"; + version = "0.3.34"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "${version}"; - hash = "sha256-juguN0X9qsrjSvZNB2XyDzz92K0e0ARF7b2O8PlluIs="; + hash = "sha256-xGznstX6RHo4vO03xnR2by9yW1jc7+E2oSVNWD/9L7c="; }; postgresqlTestSetupPost = '' From ded2d4120e40e92b5ac61bbaef1ded813a77d59a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Apr 2025 18:36:48 +0200 Subject: [PATCH 33/66] python313Packages.dash-bootstrap-components: 2.0.1 -> 2.0.2 Changelog: https://github.com/facultyai/dash-bootstrap-components/releases/tag/2.0.2 --- .../python-modules/dash-bootstrap-components/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/dash-bootstrap-components/default.nix b/pkgs/development/python-modules/dash-bootstrap-components/default.nix index 9dc33d119b02..e74224bc346a 100644 --- a/pkgs/development/python-modules/dash-bootstrap-components/default.nix +++ b/pkgs/development/python-modules/dash-bootstrap-components/default.nix @@ -4,20 +4,17 @@ fetchPypi, dash, hatchling, - pythonOlder, }: buildPythonPackage rec { pname = "dash-bootstrap-components"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { inherit version; pname = "dash_bootstrap_components"; - hash = "sha256-PMZYbzfLP8wEvHLTgBwHt5IEAGaizHjSMwiFUpJl7Cg="; + hash = "sha256-81IY8OXisVkSHz4BDmGzImsKZ4svWC0L0gfULSkTLMA="; }; build-system = [ hatchling ]; From c7b475f9683d690ecad09dfeb86e3d82c9240d0b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Apr 2025 20:16:54 +0200 Subject: [PATCH 34/66] python313Packages.snowflake-sqlalchemy: refactor --- .../snowflake-sqlalchemy/default.nix | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 5baa0346a3ea..5d08a3531586 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -1,44 +1,41 @@ { lib, buildPythonPackage, - fetchPypi, - six, + fetchFromGitHub, + hatchling, snowflake-connector-python, sqlalchemy, - pythonOlder, }: buildPythonPackage rec { pname = "snowflake-sqlalchemy"; version = "1.7.3"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-LtmTsdAAQhxjaTj4qCUlFsvuTPn64S6jT9cFIxaNjZg="; + src = fetchFromGitHub { + owner = "snowflakedb"; + repo = "snowflake-sqlalchemy"; + tag = "v${version}"; + hash = "sha256-E3UnlsGaQPlxHSgBVGrG8pGCA8fE7yN5x9eidbMQ10w="; }; - propagatedBuildInputs = [ - six + build-system = [ hatchling ]; + + dependencies = [ snowflake-connector-python sqlalchemy ]; - # Pypi does not include tests + # Tests require a database doCheck = false; pythonImportsCheck = [ "snowflake.sqlalchemy" ]; meta = with lib; { - changelog = "https://github.com/snowflakedb/snowflake-sqlalchemy/blob/v${version}/DESCRIPTION.md"; description = "Snowflake SQLAlchemy Dialect"; + changelog = "https://github.com/snowflakedb/snowflake-sqlalchemy/blob/v${version}/DESCRIPTION.md"; homepage = "https://github.com/snowflakedb/snowflake-sqlalchemy"; license = licenses.asl20; maintainers = [ ]; - - # https://github.com/snowflakedb/snowflake-sqlalchemy/issues/380 - broken = versionAtLeast sqlalchemy.version "2"; }; } From f138ee2ee5b27e295e24d27d3d91b6f0d9d3f8a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Apr 2025 18:20:06 +0000 Subject: [PATCH 35/66] python312Packages.sphinx-automodapi: 0.18.0 -> 0.19.0 --- pkgs/development/python-modules/sphinx-automodapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-automodapi/default.nix b/pkgs/development/python-modules/sphinx-automodapi/default.nix index 4cc944113d71..fa83758747d4 100644 --- a/pkgs/development/python-modules/sphinx-automodapi/default.nix +++ b/pkgs/development/python-modules/sphinx-automodapi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "sphinx-automodapi"; - version = "0.18.0"; + version = "0.19.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "astropy"; repo = pname; tag = "v${version}"; - hash = "sha256-YTaoGBYQvuUbMYe4FKmtgxcAxeesU/ruVXPOjZXGLGU="; + hash = "sha256-idz14x6ErHqkbAYzEpBmZFpv2lY+dJqhM2ChJys+Ed8="; leaveDotGit = true; }; From b41a1c5a563159e05cdef20305aa9278fe38e523 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Fri, 25 Apr 2025 14:50:20 -0400 Subject: [PATCH 36/66] typst: Inherit meta attributes from package, add maintainer Main motivation is lib.getExe working without a warning. --- pkgs/by-name/ty/typst/package.nix | 1 + pkgs/by-name/ty/typst/with-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix index cc22026c7462..7efdd3424d2d 100644 --- a/pkgs/by-name/ty/typst/package.nix +++ b/pkgs/by-name/ty/typst/package.nix @@ -73,6 +73,7 @@ rustPlatform.buildRustPackage (finalAttrs: { drupol figsoda kanashimia + RossSmyth ]; }; }) diff --git a/pkgs/by-name/ty/typst/with-packages.nix b/pkgs/by-name/ty/typst/with-packages.nix index b142a0cbbe99..f2eac5743969 100644 --- a/pkgs/by-name/ty/typst/with-packages.nix +++ b/pkgs/by-name/ty/typst/with-packages.nix @@ -10,6 +10,7 @@ lib.makeOverridable ( { ... }@typstPkgs: f: buildEnv { + inherit (typst) meta; name = "${typst.name}-env"; paths = lib.foldl' (acc: p: acc ++ lib.singleton p ++ p.propagatedBuildInputs) [ ] (f typstPkgs); From 47fdf06101c5c78da29329c74a4e0795d6fb4bea Mon Sep 17 00:00:00 2001 From: Benedikt Ritter Date: Fri, 4 Apr 2025 10:44:35 +0200 Subject: [PATCH 37/66] gradle: Improve toolchains test Previously the test relied on the output of the javaToolchains task and therefore on the way that toolchains are passed to Gradle. This was brittle in case we want to change the way of how we supply toolchains to Gradle (see e.g. #366929). After this change, instead of inspecting the output of javaToolchains, the toolchains test now tries to assemble a project using a toolchain that was passed via the gradle.override. --- .../tools/build-managers/gradle/default.nix | 15 +++++++-------- .../gradle/tests/toolchains/build.gradle | 11 +++++++++++ .../tests/toolchains/src/main/java/Main.java | 5 +++++ pkgs/top-level/all-packages.nix | 1 - 4 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/tools/build-managers/gradle/tests/toolchains/build.gradle create mode 100644 pkgs/development/tools/build-managers/gradle/tests/toolchains/src/main/java/Main.java diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index b557d85eff15..e6fbdaec0767 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,5 +1,4 @@ { - jdk11, jdk17, jdk21, jdk23, @@ -288,27 +287,27 @@ rec { unwrapped = gradle; tests = { toolchains = + let + javaVersion = lib.substring 0 2 (lib.getVersion jdk23); + in runCommand "detects-toolchains-from-nix-env" { # Use JDKs that are not the default for any of the gradle versions nativeBuildInputs = [ (gradle.override { javaToolchains = [ - jdk11 jdk23 ]; }) ]; - src = ./tests/java-application; + src = ./tests/toolchains; } '' cp -a $src/* . + substituteInPlace ./build.gradle --replace-fail '@JAVA_VERSION@' '${javaVersion}' env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \ - gradle javaToolchains --no-daemon --quiet --console plain > $out - cat $out | grep "Language Version: 11" - cat $out | grep "Detected by: environment variable 'JAVA_TOOLCHAIN_NIX_0'" - cat $out | grep "Language Version: 23" - cat $out | grep "Detected by: environment variable 'JAVA_TOOLCHAIN_NIX_1'" + gradle run --no-daemon --quiet --console plain > $out + grep -q "JAVA_VERSION: ${javaVersion}" $out || exit 1 ''; } // gradle.tests; } diff --git a/pkgs/development/tools/build-managers/gradle/tests/toolchains/build.gradle b/pkgs/development/tools/build-managers/gradle/tests/toolchains/build.gradle new file mode 100644 index 000000000000..6ebe69eafac8 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/tests/toolchains/build.gradle @@ -0,0 +1,11 @@ +plugins { + id('application') +} + +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(@JAVA_VERSION@)) +} + +application { + mainClass = 'Main' +} diff --git a/pkgs/development/tools/build-managers/gradle/tests/toolchains/src/main/java/Main.java b/pkgs/development/tools/build-managers/gradle/tests/toolchains/src/main/java/Main.java new file mode 100644 index 000000000000..02a213d9fd1b --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/tests/toolchains/src/main/java/Main.java @@ -0,0 +1,5 @@ +public class Main { + public static void main(String[] args) { + System.out.println("JAVA_VERSION: " + System.getProperty("java.version")); + } +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e79fba3425e..e849f4a0da58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8317,7 +8317,6 @@ with pkgs; gnumake = callPackage ../development/tools/build-managers/gnumake { }; gradle-packages = import ../development/tools/build-managers/gradle { inherit - jdk11 jdk17 jdk21 jdk23 From 724e15d2b25909a80f1ec29cced9295d23fa814c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Apr 2025 21:14:47 +0200 Subject: [PATCH 38/66] python313Packages.restview: fix typo --- pkgs/development/python-modules/restview/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index c9ffbc56b443..40fda528f261 100644 --- a/pkgs/development/python-modules/restview/default.nix +++ b/pkgs/development/python-modules/restview/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { hash = "sha256-i011oL7Xa2e0Vu9wEfTrbJilVsn4N2Qt8iAscxL8zBo="; }; - pythonRelaxDeps = [ "readme-renderer" ]; + pythonRelaxDeps = [ "readme_renderer" ]; build-system = [ setuptools ]; From d5cef62ddaeb05ebd3a8b72c5bdc1f0e4f2d2c39 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 25 Apr 2025 21:28:26 +0200 Subject: [PATCH 39/66] python312Packages.sphinx-automodapi: refactor --- .../python-modules/sphinx-automodapi/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-automodapi/default.nix b/pkgs/development/python-modules/sphinx-automodapi/default.nix index fa83758747d4..b2f294335a5d 100644 --- a/pkgs/development/python-modules/sphinx-automodapi/default.nix +++ b/pkgs/development/python-modules/sphinx-automodapi/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, fetchurl, - pythonOlder, setuptools-scm, git, sphinx, @@ -17,22 +16,20 @@ buildPythonPackage rec { pname = "sphinx-automodapi"; version = "0.19.0"; pyproject = true; - disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "astropy"; - repo = pname; + repo = "sphinx-automodapi"; tag = "v${version}"; hash = "sha256-idz14x6ErHqkbAYzEpBmZFpv2lY+dJqhM2ChJys+Ed8="; leaveDotGit = true; }; - nativeBuildInputs = [ - setuptools-scm - git - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ sphinx ]; + nativeBuildInputs = [ git ]; + + dependencies = [ sphinx ]; # https://github.com/astropy/sphinx-automodapi/issues/155 testInventory = fetchurl { @@ -58,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx extension for generating API documentation"; homepage = "https://github.com/astropy/sphinx-automodapi"; + changelog = "https://github.com/astropy/sphinx-automodapi/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = with maintainers; [ lovesegfault ]; }; From 2e5d3a13b1273933d4a5ffa02ea78b1cfc04a628 Mon Sep 17 00:00:00 2001 From: Benedikt Ritter Date: Fri, 25 Apr 2025 19:29:06 +0000 Subject: [PATCH 40/66] Fix indent Co-authored-by: Olli Helenius --- pkgs/development/tools/build-managers/gradle/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index e6fbdaec0767..1fc85c05e0eb 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -306,7 +306,7 @@ rec { cp -a $src/* . substituteInPlace ./build.gradle --replace-fail '@JAVA_VERSION@' '${javaVersion}' env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \ - gradle run --no-daemon --quiet --console plain > $out + gradle run --no-daemon --quiet --console plain > $out grep -q "JAVA_VERSION: ${javaVersion}" $out || exit 1 ''; } // gradle.tests; From 6901ff202614d42ede333c29b0f0a913f0756caf Mon Sep 17 00:00:00 2001 From: Benedikt Ritter Date: Fri, 25 Apr 2025 19:29:43 +0000 Subject: [PATCH 41/66] Improve matching the Java version Co-authored-by: Olli Helenius --- pkgs/development/tools/build-managers/gradle/default.nix | 2 +- .../gradle/tests/toolchains/src/main/java/Main.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 1fc85c05e0eb..2540f210d423 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -307,7 +307,7 @@ rec { substituteInPlace ./build.gradle --replace-fail '@JAVA_VERSION@' '${javaVersion}' env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \ gradle run --no-daemon --quiet --console plain > $out - grep -q "JAVA_VERSION: ${javaVersion}" $out || exit 1 + test "$(<$out)" = "${javaVersion}" ''; } // gradle.tests; } diff --git a/pkgs/development/tools/build-managers/gradle/tests/toolchains/src/main/java/Main.java b/pkgs/development/tools/build-managers/gradle/tests/toolchains/src/main/java/Main.java index 02a213d9fd1b..3ddc68e6ba3f 100644 --- a/pkgs/development/tools/build-managers/gradle/tests/toolchains/src/main/java/Main.java +++ b/pkgs/development/tools/build-managers/gradle/tests/toolchains/src/main/java/Main.java @@ -1,5 +1,5 @@ public class Main { public static void main(String[] args) { - System.out.println("JAVA_VERSION: " + System.getProperty("java.version")); + System.out.println(System.getProperty("java.version")); } } From 2d72e0e3ee5ef4b7b978e353cc59b45eabf7b12a Mon Sep 17 00:00:00 2001 From: Benedikt Ritter Date: Fri, 25 Apr 2025 19:30:06 +0000 Subject: [PATCH 42/66] Tweak getting Java major version Co-authored-by: Olli Helenius --- pkgs/development/tools/build-managers/gradle/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 2540f210d423..d8a277b57e23 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -288,7 +288,7 @@ rec { tests = { toolchains = let - javaVersion = lib.substring 0 2 (lib.getVersion jdk23); + javaVersion = lib.versions.major (lib.getVersion jdk23); in runCommand "detects-toolchains-from-nix-env" { From 4c9712eb352636abb4b239d13b744c7475e2d6d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Apr 2025 21:20:40 +0000 Subject: [PATCH 43/66] python312Packages.langgraph-cli: 0.2.5 -> 0.2.7 --- pkgs/development/python-modules/langgraph-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix index d9fcad01c893..d435365fe812 100644 --- a/pkgs/development/python-modules/langgraph-cli/default.nix +++ b/pkgs/development/python-modules/langgraph-cli/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "langgraph-cli"; - version = "0.2.5"; + version = "0.2.7"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "cli==${version}"; - hash = "sha256-vEaD4uUblTkgahoeGmjCOmHrfszLPmKwgavlPOW+wSw="; + hash = "sha256-i4xOfgg2quLKzKNQWQJyFjKuVLCqultVeq0Q89Utx7s="; }; sourceRoot = "${src.name}/libs/cli"; From 10a8c79dc0d1e447609349f142a46a3dbd7dfa3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Apr 2025 23:26:07 +0000 Subject: [PATCH 44/66] circt: 1.114.0 -> 1.114.1 --- pkgs/by-name/ci/circt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index 304fb61ac210..184c78403ae1 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -19,12 +19,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.114.0"; + version = "1.114.1"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-wNgaOQaL5Vl9bvFMpYNijvyYxlSccGiSsxfk0QRpMCo="; + hash = "sha256-VCoXuJl5Qyvu+TQSZHEx7bmF8p3hlp8vNyhFBSQ7ePQ="; fetchSubmodules = true; }; From dabd1a06c16e75636f439d37f954934f15dbcc8e Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 9 Apr 2025 11:37:29 -0400 Subject: [PATCH 45/66] python313Packages.gluonts: init at 0.16.1 --- .../python-modules/gluonts/default.nix | 113 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 115 insertions(+) create mode 100644 pkgs/development/python-modules/gluonts/default.nix diff --git a/pkgs/development/python-modules/gluonts/default.nix b/pkgs/development/python-modules/gluonts/default.nix new file mode 100644 index 000000000000..4e3c2b79565f --- /dev/null +++ b/pkgs/development/python-modules/gluonts/default.nix @@ -0,0 +1,113 @@ +{ + stdenv, + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + + # dependencies + numpy, + pandas, + pydantic, + tqdm, + toolz, + + # optional dependencies (torch) + torch, + lightning, + scipy, + + # test + pytestCheckHook, + distutils, + matplotlib, + pyarrow, + statsmodels, + which, +}: + +buildPythonPackage rec { + pname = "gluonts"; + version = "0.16.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "gluonts"; + tag = "v${version}"; + hash = "sha256-i4yCNe8C9BZw6AZUDOZC1E9PQOOOoUovSZnOF1yzycM="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + numpy + pandas + pydantic + tqdm + toolz + ]; + + optional-dependencies = { + torch = [ + torch + lightning + scipy + ]; + }; + + pythonRelaxDeps = [ + "numpy" + "toolz" + ]; + + pythonImportsCheck = [ + "gluonts" + "gluonts.core" + "gluonts.dataset" + "gluonts.ev" + "gluonts.evaluation" + "gluonts.ext" + "gluonts.model" + "gluonts.shell" + "gluonts.time_feature" + "gluonts.torch" + "gluonts.transform" + ]; + + nativeCheckInputs = [ + pytestCheckHook + distutils + matplotlib + pyarrow + statsmodels + which + ] ++ optional-dependencies.torch; + + preCheck = ''export HOME=$(mktemp -d)''; + + disabledTestPaths = [ + # requires `cpflows`, not in Nixpkgs + "test/torch/model" + ]; + + disabledTests = + [ + # tries to access network + "test_against_former_evaluator" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # RuntimeError: *** -[__NSPlaceholderArray initWithObjects:count:]: attempt to insert nil object from objects[1] + "test_forecast" + ]; + + meta = { + description = "Probabilistic time series modeling in Python"; + homepage = "https://ts.gluon.ai"; + changelog = "https://github.com/awslabs/gluonts/releases/tag/${src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 57d880a4b71b..eeafcd5ca496 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5584,6 +5584,8 @@ self: super: with self; { glueviz = callPackage ../development/python-modules/glueviz { }; + gluonts = callPackage ../development/python-modules/gluonts { }; + glymur = callPackage ../development/python-modules/glymur { }; glyphsets = callPackage ../development/python-modules/glyphsets { }; From 92b8c595392164dd2dac62c35d718f29a83fe4ff Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Sat, 26 Apr 2025 00:29:59 +0000 Subject: [PATCH 46/66] uv: 0.6.16 -> 0.6.17 --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 10cab5638b88..40a9078906db 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -20,17 +20,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.6.16"; + version = "0.6.17"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-udghrau7ZpLngjwL4mOMvUJT8G609HuBL51Te+h66YY="; + hash = "sha256-Cbk7doAz7meokxUhDMMMB21t6WMr2s+ypvYbVEmmGM8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-1eq5gsHcf8iAR2z89WnZNdcoToE0Cpl4HgsiffSg1wk="; + cargoHash = "sha256-jruywuF3CEfBV58QKq/22Y7ueXoEKQWPJ0DmAdo7hrY="; buildInputs = [ rust-jemalloc-sys From bc3ec03a24e503e17f7136616f24d44f109d4d96 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 26 Apr 2025 00:42:12 +0200 Subject: [PATCH 47/66] SDL_audiolib: 0-unstable-2022-04-17 -> 0-unstable-2022-07-13 --- pkgs/by-name/sd/SDL_audiolib/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sd/SDL_audiolib/package.nix b/pkgs/by-name/sd/SDL_audiolib/package.nix index 5e919d9ce3af..3ea39925863b 100644 --- a/pkgs/by-name/sd/SDL_audiolib/package.nix +++ b/pkgs/by-name/sd/SDL_audiolib/package.nix @@ -5,17 +5,19 @@ fetchFromGitHub, pkg-config, stdenv, + flac, }: stdenv.mkDerivation (finalAttrs: { pname = "SDL_audiolib"; - version = "0-unstable-2022-04-17"; + # don't update to latest master as it will break some sounds in devilutionx + version = "0-unstable-2022-07-13"; src = fetchFromGitHub { owner = "realnc"; repo = "SDL_audiolib"; - rev = "908214606387ef8e49aeacf89ce848fb36f694fc"; - hash = "sha256-11KkwIhG1rX7yDFSj92NJRO9L2e7XZGq2gOJ54+sN/A="; + rev = "cc1bb6af8d4cf5e200259072bde1edd1c8c5137e"; + hash = "sha256-xP7qlwwOkqVeTlCEZLinnvmx8LbU2co5+t//cf4n190="; }; nativeBuildInputs = [ @@ -26,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 + flac ]; strictDeps = true; From 5e3f31204c9d7a7c64ec8ed8b83c4ce249fa577c Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 26 Apr 2025 00:42:12 +0200 Subject: [PATCH 48/66] devilutionx: modernize --- .../add-nix-share-path-to-mpq-search.patch | 12 +++ pkgs/games/devilutionx/default.nix | 76 +++++-------------- pkgs/top-level/all-packages.nix | 7 +- 3 files changed, 30 insertions(+), 65 deletions(-) create mode 100644 pkgs/games/devilutionx/add-nix-share-path-to-mpq-search.patch diff --git a/pkgs/games/devilutionx/add-nix-share-path-to-mpq-search.patch b/pkgs/games/devilutionx/add-nix-share-path-to-mpq-search.patch new file mode 100644 index 000000000000..ec8198fcc84e --- /dev/null +++ b/pkgs/games/devilutionx/add-nix-share-path-to-mpq-search.patch @@ -0,0 +1,12 @@ +diff --git a/Source/init.cpp b/Source/init.cpp +index 4e6fab1..ecd4ff9 100644 +--- a/Source/init.cpp ++++ b/Source/init.cpp +@@ -144,6 +144,7 @@ std::vector GetMPQSearchPaths() + paths.emplace_back("/usr/local/share/diasurgical/devilutionx/"); + paths.emplace_back("/usr/share/diasurgical/devilutionx/"); + } ++ paths.emplace_back("@assets@"); + #elif defined(NXDK) + paths.emplace_back("D:\\"); + #elif (defined(_WIN64) || defined(_WIN32)) && !defined(__UWP__) && !defined(NXDK) diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix index ebd203843464..bf72f91e1285 100644 --- a/pkgs/games/devilutionx/default.nix +++ b/pkgs/games/devilutionx/default.nix @@ -8,10 +8,10 @@ pkg-config, gettext, libsodium, - SDL2_classic, + SDL2, SDL2_image, SDL_audiolib, - flac, + simpleini, fmt, libpng, libtiff, @@ -48,37 +48,21 @@ let rev = "d6c6a069a5041a3e89594c447ced3f15d77618b8"; sha256 = "sha256-ttRJLfaGHzhS4jd8db7BNPWROCti3ZxuRouqsL/M5ew="; }; - - # breaks without this version - SDL_audiolib' = SDL_audiolib.overrideAttrs (oldAttrs: { - src = fetchFromGitHub { - owner = "realnc"; - repo = "SDL_audiolib"; - rev = "cc1bb6af8d4cf5e200259072bde1edd1c8c5137e"; - sha256 = "sha256-xP7qlwwOkqVeTlCEZLinnvmx8LbU2co5+t//cf4n190="; - }; - - buildInputs = oldAttrs.buildInputs ++ [ flac ]; - }); - - # missing pkg-config and/or cmake file - simpleini = fetchurl { - url = "https://github.com/brofield/simpleini/archive/56499b5af5d2195c6acfc58c4630b70e0c9c4c21.tar.gz"; - sha256 = "sha256-29tQoz0+33kfwmIjCdnD1wGi+35+K0A9P6UE4E8K3g4="; - }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "devilutionx"; version = "1.5.4"; src = fetchFromGitHub { owner = "diasurgical"; repo = "devilutionX"; - rev = version; - sha256 = "sha256-F23MTe7vMOgIBH6qm7X1+8gIMmN9E+d/GZnFsQZt2cM="; + tag = finalAttrs.version; + hash = "sha256-F23MTe7vMOgIBH6qm7X1+8gIMmN9E+d/GZnFsQZt2cM="; }; + patches = [ ./add-nix-share-path-to-mpq-search.patch ]; + postPatch = '' substituteInPlace 3rdParty/asio/CMakeLists.txt --replace-fail "${asio.url}" "${asio}" substituteInPlace 3rdParty/libmpq/CMakeLists.txt --replace-fail "${libmpq.url}" "${libmpq}" @@ -86,7 +70,8 @@ stdenv.mkDerivation rec { substituteInPlace 3rdParty/libzt/CMakeLists.txt \ --replace-fail "GIT_REPOSITORY https://github.com/diasurgical/libzt.git" "" \ --replace-fail "GIT_TAG ${libzt.rev}" "SOURCE_DIR ${libzt}" - substituteInPlace 3rdParty/simpleini/CMakeLists.txt --replace-fail "${simpleini.url}" "${simpleini}" + substituteInPlace Source/init.cpp \ + --replace-fail "@assets@" "$out/share/diasurgical/devilutionx/" ''; nativeBuildInputs = [ @@ -103,49 +88,22 @@ stdenv.mkDerivation rec { libtiff libwebp libsodium - SDL2_classic + SDL2 SDL2_image - SDL_audiolib' + SDL_audiolib + simpleini ]; - installPhase = - '' - runHook preInstall - - '' - + ( - if stdenv.hostPlatform.isDarwin then - '' - mkdir -p $out/Applications - mv devilutionx.app $out/Applications - '' - else - '' - install -Dm755 -t $out/bin devilutionx - install -Dm755 -t $out/bin devilutionx.mpq - install -Dm755 -t $out/share/diasurgical/devilutionx devilutionx.mpq - install -Dm755 -t $out/share/applications ../Packaging/nix/devilutionx-hellfire.desktop ../Packaging/nix/devilutionx.desktop - install -Dm755 ../Packaging/resources/icon.png $out/share/icons/hicolor/512x512/apps/devilutionx.png - install -Dm755 ../Packaging/resources/hellfire.png $out/share/icons/hicolor/512x512/apps/devilutionx-hellfire.png - install -Dm755 ../Packaging/resources/icon_32.png $out/share/icons/hicolor/32x32/apps/devilutionx.png - install -Dm755 ../Packaging/resources/hellfire_32.png $out/share/icons/hicolor/32x32/apps/devilutionx-hellfire.png - '' - ) - + '' - - runHook postInstall - ''; - - meta = with lib; { + meta = { homepage = "https://github.com/diasurgical/devilutionX"; description = "Diablo build for modern operating systems"; mainProgram = "devilutionx"; longDescription = "In order to play this game a copy of diabdat.mpq is required. Place a copy of diabdat.mpq in ~/.local/share/diasurgical/devilution before executing the game."; - license = licenses.sustainableUse; - maintainers = with maintainers; [ + license = lib.licenses.sustainableUse; + maintainers = with lib.maintainers; [ karolchmist aanderse ]; - platforms = platforms.linux ++ platforms.windows; + platforms = with lib.platforms; linux ++ windows; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e79fba3425e..c92f57c14875 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17020,12 +17020,7 @@ with pkgs; ddnet-server = ddnet.override { buildClient = false; }; - devilutionx = callPackage ../games/devilutionx { - fmt = fmt_9; - SDL2_classic = SDL2_classic.override { - withStatic = true; - }; - }; + devilutionx = callPackage ../games/devilutionx { }; duckmarines = callPackage ../games/duckmarines { love = love_0_10; }; From 00647831e071925bf4d49602b9782c8087452fe7 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 26 Apr 2025 01:56:16 +0200 Subject: [PATCH 49/66] devilutionx: move to by-name --- .../de}/devilutionx/add-nix-share-path-to-mpq-search.patch | 0 .../default.nix => by-name/de/devilutionx/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{games => by-name/de}/devilutionx/add-nix-share-path-to-mpq-search.patch (100%) rename pkgs/{games/devilutionx/default.nix => by-name/de/devilutionx/package.nix} (100%) diff --git a/pkgs/games/devilutionx/add-nix-share-path-to-mpq-search.patch b/pkgs/by-name/de/devilutionx/add-nix-share-path-to-mpq-search.patch similarity index 100% rename from pkgs/games/devilutionx/add-nix-share-path-to-mpq-search.patch rename to pkgs/by-name/de/devilutionx/add-nix-share-path-to-mpq-search.patch diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/by-name/de/devilutionx/package.nix similarity index 100% rename from pkgs/games/devilutionx/default.nix rename to pkgs/by-name/de/devilutionx/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c92f57c14875..58223c2033b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17020,8 +17020,6 @@ with pkgs; ddnet-server = ddnet.override { buildClient = false; }; - devilutionx = callPackage ../games/devilutionx { }; - duckmarines = callPackage ../games/duckmarines { love = love_0_10; }; dwarf-fortress-packages = recurseIntoAttrs (callPackage ../games/dwarf-fortress { }); From 021ac69fbe62333e1b2bf722638a9d7de60c7417 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Apr 2025 02:23:27 +0000 Subject: [PATCH 50/66] seclists: 2025.1 -> 2025.2 --- pkgs/by-name/se/seclists/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/seclists/package.nix b/pkgs/by-name/se/seclists/package.nix index c27d9d98e41d..11f8dd65997c 100644 --- a/pkgs/by-name/se/seclists/package.nix +++ b/pkgs/by-name/se/seclists/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation { pname = "seclists"; - version = "2025.1"; + version = "2025.2"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "SecLists"; - rev = "2025.1"; - hash = "sha256-XfiaOaLAG8B6Kpv+oybfEBgYpoO9XlFLqhTtyuj6qV0="; + rev = "2025.2"; + hash = "sha256-gQoOGdPWM6ChD1abJb7KH+UhrFfap2ThwDLB0878wUQ="; }; installPhase = '' From 23cd04ae4a0226aa91ac3e951f7901099f3ee152 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Apr 2025 08:23:03 +0200 Subject: [PATCH 51/66] python313Packages.mkdocs-rss-plugin: disable failing tests --- .../development/python-modules/mkdocs-rss-plugin/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix index 256d6c6f13a5..a76954b7744b 100644 --- a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix @@ -52,6 +52,11 @@ buildPythonPackage rec { # Tests require network access "test_plugin_config_through_mkdocs" "test_remote_image" + # Configuration error + "test_plugin_config_blog_enabled" + "test_plugin_config_social_cards_enabled_but_integration_disabled" + "test_plugin_config_theme_material" + "test_simple_build" ]; disabledTestPaths = [ From 05ddd17308227ea3929486e7449f2247f4afc138 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Apr 2025 08:24:12 +0200 Subject: [PATCH 52/66] python313Packages.mkdocs-rss-plugin: migrate to pytest-cov-stub --- .../python-modules/mkdocs-rss-plugin/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix index a76954b7744b..d21f09234b2e 100644 --- a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix @@ -7,6 +7,7 @@ gitpython, jsonfeed, mkdocs, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -27,10 +28,6 @@ buildPythonPackage rec { hash = "sha256-Qa8EgjucJaxvKivE45kXSUgTx5RnLEpYCNZJRTO2E1Q="; }; - postPatch = '' - sed -i "/--cov/d" setup.cfg - ''; - build-system = [ setuptools ]; dependencies = [ @@ -42,6 +39,7 @@ buildPythonPackage rec { nativeCheckInputs = [ feedparser jsonfeed + pytest-cov-stub pytestCheckHook validator-collection ]; From bac499c2dbaeffe72ef50e85a0c6233695e05f54 Mon Sep 17 00:00:00 2001 From: Justin Bassett Date: Tue, 22 Apr 2025 10:58:08 -0400 Subject: [PATCH 53/66] android-studio: 2024.3.1.14 -> 2024.3.1.15 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index a1d284a44add..1c12db33c99e 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -16,8 +16,8 @@ let inherit tiling_wm; }; stableVersion = { - version = "2024.3.1.14"; # "Android Studio Meerkat | 2024.3.1 Patch 1" - sha256Hash = "sha256-VNXErfb4PhljcJwGq863ldh/3i8fMdJirlwolEIk+fI="; + version = "2024.3.1.15"; # "Android Studio Meerkat | 2024.3.1 Patch 2" + sha256Hash = "sha256-Qo5H/fqJ28HigN8iQSIIqavDX9hnYuIDbpJfCgZfxiE="; }; betaVersion = { version = "2024.3.2.12"; # "Android Studio Meerkat Feature Drop | 2024.3.2 RC 3" From d1c813727db4b6c3274afc6d8649ef23c939f32d Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 26 Apr 2025 11:44:48 +0530 Subject: [PATCH 54/66] android-studio: fix for bot not requesting maintainers Inspired by https://github.com/NixOS/nixpkgs/issues/355847#issuecomment-2727348475 Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- pkgs/applications/editors/android-studio/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index c3bbe5a74d13..00c4934e6c47 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -344,6 +344,7 @@ let ."${channel}"; mainProgram = pname; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + position = "pkgs/applications/editors/android-studio/common.nix:303"; }; } '' From 65d7af90315224be3d3261879b0f2ea0e1b190e4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Apr 2025 08:44:26 +0200 Subject: [PATCH 55/66] python313Packages.azure-mgmt-eventgrid: 10.2.0 -> 10.4.0 --- .../azure-mgmt-eventgrid/default.nix | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix index a04027b66f70..aded434c2fbf 100644 --- a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix @@ -1,32 +1,37 @@ { lib, - buildPythonPackage, - fetchPypi, - msrest, - msrestazure, azure-common, azure-mgmt-core, + buildPythonPackage, + fetchPypi, + isodate, + msrest, pythonOlder, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "azure-mgmt-eventgrid"; - version = "10.2.0"; - format = "setuptools"; + version = "10.4.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - extension = "zip"; - hash = "sha256-jJ+gvJmOTz2YXQ9BDrFgXCybplgwvOYZ5Gv7FHLhxQA="; + pname = "azure_mgmt_eventgrid"; + inherit version; + hash = "sha256-MD5eJ89LteyDO6Tlqe9wtbxBDhkEEuxHzeWdguQT+34="; }; - propagatedBuildInputs = [ - msrest - msrestazure - azure-mgmt-core + build-system = [ setuptools ]; + + dependencies = [ azure-common + azure-mgmt-core + isodate + msrest + typing-extensions ]; # has no tests @@ -36,7 +41,8 @@ buildPythonPackage rec { meta = with lib; { description = "This is the Microsoft Azure EventGrid Management Client Library"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/eventgrid/azure-mgmt-eventgrid"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-eventgrid_${version}/sdk/eventgrid/azure-mgmt-eventgrid/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; From abeb136b33aec2e2a8d1727a0fcd0700a0b60c7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Apr 2025 06:56:16 +0000 Subject: [PATCH 56/66] eask-cli: 0.11.1 -> 0.11.2 --- pkgs/by-name/ea/eask-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ea/eask-cli/package.nix b/pkgs/by-name/ea/eask-cli/package.nix index 12fad1c7ae23..e00b5b87aade 100644 --- a/pkgs/by-name/ea/eask-cli/package.nix +++ b/pkgs/by-name/ea/eask-cli/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "eask-cli"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "emacs-eask"; repo = "cli"; rev = version; - hash = "sha256-4KV/wuZCtgVFfZwNEtlj8fjNS+Pk9d8yquYGCBEj+pE="; + hash = "sha256-Lcnn84vRx9flKRouBkqtV6oehNReDfzmQr9htBl3jB0="; }; - npmDepsHash = "sha256-4AMFqX4wco+aCcWvnixR1KgYBPmQb2XSCicZpQwusRs="; + npmDepsHash = "sha256-QkgH5q8EKGXahhENGsT3NBW7RdPVrSGwiTOi3Yy+ViE="; dontBuild = true; From 04addb2b35cfc854b430fd0c87388a2795c1ee59 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 25 Apr 2025 19:00:40 +0200 Subject: [PATCH 57/66] titanion: fix build and cleanup --- pkgs/by-name/ti/titanion/package.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ti/titanion/package.nix b/pkgs/by-name/ti/titanion/package.nix index 2235d32c5148..93a7a9269a1f 100644 --- a/pkgs/by-name/ti/titanion/package.nix +++ b/pkgs/by-name/ti/titanion/package.nix @@ -5,6 +5,8 @@ fetchurl, unzip, gdc, + libGL, + libGLU, SDL, SDL_mixer, bulletml, @@ -16,7 +18,7 @@ let fetchpatch { name = "${patchname}.patch"; url = "https://sources.debian.org/data/main/t/titanion/0.3.dfsg1-7/debian/patches/${patchname}"; - sha256 = hash; + inherit hash; }; in @@ -28,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { url = "http://abagames.sakura.ne.jp/windows/ttn${ lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version }.zip"; - sha256 = "sha256-fR0cufi6dU898wP8KGl/vxbfQJzMmMxlYZ3QNGLajfM="; + hash = "sha256-fR0cufi6dU898wP8KGl/vxbfQJzMmMxlYZ3QNGLajfM="; }; patches = [ @@ -58,23 +60,27 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + libGL + libGLU SDL SDL_mixer bulletml ]; installPhase = '' + runHook preInstall install -Dm755 titanion $out/bin/titanion mkdir -p $out/share/games/titanion cp -r sounds images $out/share/games/titanion/ + runHook postInstall ''; - meta = with lib; { + meta = { homepage = "http://www.asahi-net.or.jp/~cs8k-cyu/windows/ttn_e.html"; description = "Strike down super high-velocity swooping insects"; mainProgram = "titanion"; - license = licenses.bsd2; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.all; }; }) From 09d1d8ad157c2e1e50e0c2cee7a80a85d011fe3a Mon Sep 17 00:00:00 2001 From: misilelab Date: Thu, 17 Apr 2025 13:29:20 +0900 Subject: [PATCH 58/66] passt: 2025_03_20.32f6212 -> 2025_04_15.2340bbf Signed-off-by: misilelab --- pkgs/by-name/pa/passt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/passt/package.nix b/pkgs/by-name/pa/passt/package.nix index 38a47233b5c1..7b02ff9deadb 100644 --- a/pkgs/by-name/pa/passt/package.nix +++ b/pkgs/by-name/pa/passt/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "passt"; - version = "2025_03_20.32f6212"; + version = "2025_04_15.2340bbf"; src = fetchurl { url = "https://passt.top/passt/snapshot/passt-${finalAttrs.version}.tar.gz"; - hash = "sha256-TRtFwBUUOnRwcLtB3vwU5nG/ufi9D36waXW5Yuboowk="; + hash = "sha256-eYIgAj8BtCZ9OxG8/IDaUvFCtB+1ROU0UHf6sbaVUEY="; }; postPatch = '' From 6b048ea91f12a399fa4f69da27a095e0d35fb44e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 26 Apr 2025 11:06:14 +0200 Subject: [PATCH 59/66] typstwriter: 0.2 -> 0.3 Diff: https://github.com/Bzero/typstwriter/compare/V0.2...V0.3 Changelog: https://github.com/Bzero/typstwriter/releases/tag/V0.3 --- pkgs/by-name/ty/typstwriter/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ty/typstwriter/package.nix b/pkgs/by-name/ty/typstwriter/package.nix index 0eaecd73880e..16ad4e47970e 100644 --- a/pkgs/by-name/ty/typstwriter/package.nix +++ b/pkgs/by-name/ty/typstwriter/package.nix @@ -6,23 +6,23 @@ python3.pkgs.buildPythonApplication rec { pname = "typstwriter"; - version = "0.2"; + version = "0.3"; pyproject = true; src = fetchFromGitHub { owner = "Bzero"; repo = "typstwriter"; - rev = "V${version}"; - hash = "sha256-LhK1e6q7nmk13ZW55/1uEKhg7stQLIs+2bdFJDc24bg="; + tag = "V${version}"; + hash = "sha256-0tCl/dMSWmUWZEVystb6BIYTwW7b6PH4LyERK4mi/LQ="; }; build-system = [ python3.pkgs.flit-core ]; dependencies = with python3.pkgs; [ + platformdirs pygments pyside6 qtpy - send2trash superqt ]; From 1b6cf0c6660d0c6b2860961cd20f3cb2d46c5e12 Mon Sep 17 00:00:00 2001 From: oddlama Date: Thu, 17 Apr 2025 17:20:39 +0200 Subject: [PATCH 60/66] influxdb3: 0-unstable-2025-02-17 -> 3.0.1 --- pkgs/by-name/in/influxdb3/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/influxdb3/package.nix b/pkgs/by-name/in/influxdb3/package.nix index 4a75148dcb68..a3d5f9f7eabc 100644 --- a/pkgs/by-name/in/influxdb3/package.nix +++ b/pkgs/by-name/in/influxdb3/package.nix @@ -11,7 +11,7 @@ }: rustPlatform.buildRustPackage { pname = "influxdb3"; - version = "0-unstable-2025-02-17"; + version = "3.0.1"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb"; @@ -68,8 +68,10 @@ rustPlatform.buildRustPackage { doCheck = false; passthru.updateScript = nix-update-script { - # Switch to "--version-regex" "v(3.*)" once the first real release tag is added - extraArgs = [ "--version=branch" ]; + extraArgs = [ + "--version-regex" + "v(3.*)" + ]; }; meta = { From 45e31c2cd1291e937997016cf92b97780b195b0b Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 18 Mar 2025 21:41:12 +0100 Subject: [PATCH 61/66] fp16: init at 0-unstable-2024-20-06 --- pkgs/by-name/fp/fp16/package.nix | 38 ++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/fp/fp16/package.nix diff --git a/pkgs/by-name/fp/fp16/package.nix b/pkgs/by-name/fp/fp16/package.nix new file mode 100644 index 000000000000..cdd59d613da7 --- /dev/null +++ b/pkgs/by-name/fp/fp16/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fp16"; + version = "0-unstable-2024-20-06"; + + src = fetchFromGitHub { + owner = "Maratyszcza"; + repo = "FP16"; + rev = "98b0a46bce017382a6351a19577ec43a715b6835"; + sha256 = "sha256-aob776ZGjnH4k/xfsdIcN9+wiuDreUoRBpyzrWGuxKk="; + }; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + (lib.cmakeBool "FP16_BUILD_TESTS" false) + (lib.cmakeBool "FP16_BUILD_BENCHMARKS" false) + (lib.cmakeBool "FP16_USE_SYSTEM_LIBS" true) + ]; + + doCheck = true; + + meta = { + description = "Header-only library for conversion to/from half-precision floating point formats"; + homepage = "https://github.com/Maratyszcza/FP16"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ phodina ]; + }; +}) From 79a1c6ff35544fae0e1fad7b0b5d769e1cbe3387 Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 25 Apr 2025 19:03:25 +0200 Subject: [PATCH 62/66] yarn-berry.yarn-berry-fetcher: 1.0.1 -> 1.1.0 Diff: https://cyberchaos.dev/yuka/yarn-berry-fetcher/-/compare/1.0.1...1.2.1?w=1 - Implemented support for __archiveUrl bindings - Solved performance issues with many small files - Improved help output (By @euank) --- pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix index aced36b9b700..df15e691d95f 100644 --- a/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix +++ b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix @@ -13,18 +13,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "yarn-berry-${toString berryVersion}-fetcher"; - version = "1.0.1"; + version = "1.2.1"; src = fetchFromGitLab { domain = "cyberchaos.dev"; owner = "yuka"; repo = "yarn-berry-fetcher"; - tag = "1.0.1"; - hash = "sha256-v92+aeGmT151TvcW7FvuooF3g+opdZw7QHY+CcLweJE="; + tag = "1.2.1"; + hash = "sha256-gBre1LGyDVhikigWoWWW5qZyDCHp4lDONPqg1CRtaFM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-TR9FT95WAaiRvoYBXeT0U6agF94BAdMswNncYysESKo="; + cargoHash = "sha256-KNVfwv+qaJEu3TqhCKpiTfuRvFIFcHstcpjre/QXDso="; env.YARN_ZIP_SUPPORTED_CACHE_VERSION = berryCacheVersion; env.LIBZIP_SYS_USE_PKG_CONFIG = 1; From 42bb244ece82f27ccb8e9aa0e04ee7c48bcedd25 Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 25 Apr 2025 06:51:53 +0200 Subject: [PATCH 63/66] yarn-berry.yarnBerryConfigHook: Add patchShebangs and separate rebuild step --- .../ya/yarn-berry/fetcher/yarn-berry-config-hook.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-config-hook.sh b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-config-hook.sh index 65c4e3e689ad..0fda1c6e1c1a 100644 --- a/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-config-hook.sh +++ b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-config-hook.sh @@ -75,7 +75,14 @@ yarnBerryConfigHook() { export npm_config_nodedir="@nodeSrc@" export npm_config_node_gyp="@nodeGyp@" - YARN_IGNORE_PATH=1 @yarn_offline@ install --inline-builds + YARN_IGNORE_PATH=1 @yarn_offline@ install --mode=skip-build + if [[ -z "${dontYarnBerryPatchShebangs-}" ]]; then + echo "Running patchShebangs in between the Link and the Build step..." + patchShebangs node_modules + fi + if ! [[ "$YARN_ENABLE_SCRIPTS" == "0" || "$YARN_ENABLE_SCRIPTS" == "false" ]]; then + YARN_IGNORE_PATH=1 @yarn_offline@ install --inline-builds + fi echo "finished yarnBerryConfigHook" } From 5ca2c4b225e1074665b9098b005f737b13753e39 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Sat, 26 Apr 2025 10:59:32 +0200 Subject: [PATCH 64/66] gh: fix `--version` showing date in the 80s --- pkgs/by-name/gh/gh/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix index ff4032cf0181..85639d4984e2 100644 --- a/pkgs/by-name/gh/gh/package.nix +++ b/pkgs/by-name/gh/gh/package.nix @@ -23,9 +23,11 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; + # N.B.: using the Makefile is intentional. + # We pass "nixpkgs" for build.Date to avoid `gh --version` reporting a very old date. buildPhase = '' runHook preBuild - make GO_LDFLAGS="-s -w" GH_VERSION=${version} bin/gh ${lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) "manpages"} + make GO_LDFLAGS="-s -w -X github.com/cli/cli/v${lib.versions.major version}/internal/build.Date=nixpkgs" GH_VERSION=${version} bin/gh ${lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) "manpages"} runHook postBuild ''; From 200e6f4e8ac48a2b977937510d2ac45edee62396 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Apr 2025 10:38:51 +0000 Subject: [PATCH 65/66] pinact: 2.2.0 -> 3.0.5 --- pkgs/by-name/pi/pinact/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix index f6d290f42ef1..a13b2f069682 100644 --- a/pkgs/by-name/pi/pinact/package.nix +++ b/pkgs/by-name/pi/pinact/package.nix @@ -8,19 +8,19 @@ let pname = "pinact"; - version = "2.2.0"; + version = "3.0.5"; src = fetchFromGitHub { owner = "suzuki-shunsuke"; repo = "pinact"; tag = "v${version}"; - hash = "sha256-h/Y+zFqWmd+TVkM+2CLC4Txz8/Vwvck+goslPEQlXOA="; + hash = "sha256-p8GOXx++wcUrQATlojx0D4ymlPFw9TCqL6YGSTOaRDo="; }; mainProgram = "pinact"; in buildGoModule { inherit pname version src; - vendorHash = "sha256-36U5R9eXwfwXrJFsdNri7HPEq8t2AT4f/Gn//ane/48="; + vendorHash = "sha256-+iYNducL+tX34L5VlisqeNwvJUcuOAkEWDk/2JbfC0Q="; env.CGO_ENABLED = 0; From 3757e47ad2c4d7cd18412145ecc56b53927398bb Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 18 Mar 2025 21:43:11 +0100 Subject: [PATCH 66/66] neargye-semver: init at 0.3.1 --- pkgs/by-name/ne/neargye-semver/package.nix | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/ne/neargye-semver/package.nix diff --git a/pkgs/by-name/ne/neargye-semver/package.nix b/pkgs/by-name/ne/neargye-semver/package.nix new file mode 100644 index 000000000000..948b5bd82a8b --- /dev/null +++ b/pkgs/by-name/ne/neargye-semver/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "neargye-semver"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "Neargye"; + repo = "semver"; + tag = "v${finalAttrs.version}"; + sha256 = "sha256-0HOp+xzo8xcCUUgtSh87N9DXP5P0odBaYXhcDzOiiXE="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + doCheck = true; + + # Install headers + postInstall = '' + mkdir -p $out/include + cp -r $src/include/* $out/include/ + ''; + + meta = { + description = "C++17 header-only dependency-free versioning library complying with Semantic Versioning 2.0.0"; + homepage = "https://github.com/Neargye/semver"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ phodina ]; + }; +})