From 09de72aad036c5b9fb1cca78642cbe04531ea9d8 Mon Sep 17 00:00:00 2001 From: Philip Wilk Date: Sun, 23 Mar 2025 16:43:59 +0000 Subject: [PATCH 01/92] python3Packages.mlxtend: 0.23.3->0.23.4 --- ...test-replace-np.float_-to-np.float64.patch | 109 ------------------ .../python-modules/mlxtend/default.nix | 9 +- 2 files changed, 2 insertions(+), 116 deletions(-) delete mode 100644 pkgs/development/python-modules/mlxtend/0001-fix-test-replace-np.float_-to-np.float64.patch diff --git a/pkgs/development/python-modules/mlxtend/0001-fix-test-replace-np.float_-to-np.float64.patch b/pkgs/development/python-modules/mlxtend/0001-fix-test-replace-np.float_-to-np.float64.patch deleted file mode 100644 index c196d2bb5035..000000000000 --- a/pkgs/development/python-modules/mlxtend/0001-fix-test-replace-np.float_-to-np.float64.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 360cb75317aecaf6b9abcf24f0577afef75c464e Mon Sep 17 00:00:00 2001 -From: wxt <3264117476@qq.com> -Date: Mon, 6 Jan 2025 20:41:27 +0800 -Subject: [PATCH] fix(test): replace np.float_ to np.float64 - ---- - mlxtend/_base/_regressor.py | 2 +- - mlxtend/_base/tests/test_classifier.py | 2 +- - mlxtend/_base/tests/test_cluster.py | 2 +- - mlxtend/classifier/multilayerperceptron.py | 2 +- - mlxtend/classifier/softmax_regression.py | 2 +- - mlxtend/math/linalg.py | 2 +- - mlxtend/plotting/tests/test_decision_regions.py | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/mlxtend/_base/_regressor.py b/mlxtend/_base/_regressor.py -index e3d0a1d..1d3a5d6 100644 ---- a/mlxtend/_base/_regressor.py -+++ b/mlxtend/_base/_regressor.py -@@ -16,7 +16,7 @@ class _Regressor(object): - pass - - def _check_target_array(self, y, allowed=None): -- if not isinstance(y[0], (float, np.float_)): -+ if not isinstance(y[0], (float, np.float64)): - raise AttributeError("y must be a float array.\nFound %s" % y.dtype) - - def fit(self, X, y, init_params=True): -diff --git a/mlxtend/_base/tests/test_classifier.py b/mlxtend/_base/tests/test_classifier.py -index f77f74d..1bbac6d 100644 ---- a/mlxtend/_base/tests/test_classifier.py -+++ b/mlxtend/_base/tests/test_classifier.py -@@ -51,7 +51,7 @@ def test_check_labels_not_ok_1(): - - - def test_check_labels_integer_notok(): -- y = np.array([1.0, 2.0], dtype=np.float_) -+ y = np.array([1.0, 2.0], dtype=np.float64) - cl = BlankClassifier(print_progress=0, random_seed=1) - with pytest.raises(AttributeError) as excinfo: - cl._check_target_array(y) -diff --git a/mlxtend/_base/tests/test_cluster.py b/mlxtend/_base/tests/test_cluster.py -index 6da1a9d..54c2526 100644 ---- a/mlxtend/_base/tests/test_cluster.py -+++ b/mlxtend/_base/tests/test_cluster.py -@@ -51,7 +51,7 @@ def test_check_labels_not_ok_1(): - - - def test_check_labels_integer_notok(): -- y = np.array([1.0, 2.0], dtype=np.float_) -+ y = np.array([1.0, 2.0], dtype=np.float64) - cl = BlankClassifier(print_progress=0, random_seed=1) - with pytest.raises(AttributeError) as excinfo: - cl._check_target_array(y) -diff --git a/mlxtend/classifier/multilayerperceptron.py b/mlxtend/classifier/multilayerperceptron.py -index 770dab9..05416c3 100644 ---- a/mlxtend/classifier/multilayerperceptron.py -+++ b/mlxtend/classifier/multilayerperceptron.py -@@ -143,7 +143,7 @@ class MultiLayerPerceptron( - prev_grad_b_out = np.zeros(shape=self.b_["out"].shape) - prev_grad_w_out = np.zeros(shape=self.w_["out"].shape) - -- y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float_) -+ y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float64) - - self.init_time_ = time() - -diff --git a/mlxtend/classifier/softmax_regression.py b/mlxtend/classifier/softmax_regression.py -index 56444e5..173154e 100644 ---- a/mlxtend/classifier/softmax_regression.py -+++ b/mlxtend/classifier/softmax_regression.py -@@ -141,7 +141,7 @@ class SoftmaxRegression(_BaseModel, _IterativeModel, _Classifier, _MultiClass): - ) - self.cost_ = [] - -- y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float_) -+ y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float64) - - self.init_time_ = time() - rgen = np.random.RandomState(self.random_seed) -diff --git a/mlxtend/math/linalg.py b/mlxtend/math/linalg.py -index 02600f1..ece4c3c 100644 ---- a/mlxtend/math/linalg.py -+++ b/mlxtend/math/linalg.py -@@ -45,7 +45,7 @@ def vectorspace_orthonormalization(ary, eps=1e-13): # method='gram-schmidt', - # 2c) Normalize if linearly independent, - # and set to zero otherwise - -- arr = ary.astype(np.float_).copy() -+ arr = ary.astype(np.float64).copy() - - for i in range(arr.shape[1]): - for j in range(i): -diff --git a/mlxtend/plotting/tests/test_decision_regions.py b/mlxtend/plotting/tests/test_decision_regions.py -index fba2255..aad63ff 100644 ---- a/mlxtend/plotting/tests/test_decision_regions.py -+++ b/mlxtend/plotting/tests/test_decision_regions.py -@@ -94,7 +94,7 @@ def test_y_int_ary(): - "Try passing the array as y.astype(np.int_)", - plot_decision_regions, - X[:, :2], -- y.astype(np.float_), -+ y.astype(np.float64), - sr, - ) - --- -2.47.0 - diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 1ee22516471f..61c4acfa2460 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mlxtend"; - version = "0.23.3"; + version = "0.23.4"; pyproject = true; disabled = isPy27; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "rasbt"; repo = "mlxtend"; tag = "v${version}"; - hash = "sha256-c6I0dwu4y/Td2G6m2WP/52W4noQUmQMDvpzXA9RZauo="; + hash = "sha256-xoAHYRmqN5SrEWlc18ntTZ6WAznBlVZdf+x5Yev3ysE="; }; build-system = [ setuptools ]; @@ -39,11 +39,6 @@ buildPythonPackage rec { joblib ]; - patches = [ - # https://github.com/rasbt/mlxtend/pull/1119 - ./0001-fix-test-replace-np.float_-to-np.float64.patch - ]; - nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "-sv" ]; From 475d8959f1bf3cbd9aa9a730c62ea5fd5651f9eb Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 28 Jan 2025 17:28:35 +0200 Subject: [PATCH 02/92] python312Packages.mlxtend: cleanup unused old numpy_1 argument (cherry picked from commit 9110407f62978963a20e2b10574d7986b4f330b3) --- pkgs/development/python-modules/mlxtend/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 61c4acfa2460..d6e970dbd719 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -7,7 +7,6 @@ pytestCheckHook, scipy, numpy, - numpy_1, scikit-learn, pandas, matplotlib, From faa73bb540fd99bae4b14e057b34123d3e8cef61 Mon Sep 17 00:00:00 2001 From: Philip Wilk Date: Sun, 23 Mar 2025 16:44:21 +0000 Subject: [PATCH 03/92] python3Packages.mlxtend: fix scikit >1.6.0 compat --- ...fier-fit-ensure-compatibility-with-s.patch | 80 +++++++++++++++++++ .../python-modules/mlxtend/default.nix | 5 ++ 2 files changed, 85 insertions(+) create mode 100644 pkgs/development/python-modules/mlxtend/0001-StackingCVClassifier-fit-ensure-compatibility-with-s.patch diff --git a/pkgs/development/python-modules/mlxtend/0001-StackingCVClassifier-fit-ensure-compatibility-with-s.patch b/pkgs/development/python-modules/mlxtend/0001-StackingCVClassifier-fit-ensure-compatibility-with-s.patch new file mode 100644 index 000000000000..2d807ef2c2e0 --- /dev/null +++ b/pkgs/development/python-modules/mlxtend/0001-StackingCVClassifier-fit-ensure-compatibility-with-s.patch @@ -0,0 +1,80 @@ +From 1fb59eb42f4bef229b953de313c7e78f0857ea42 Mon Sep 17 00:00:00 2001 +From: Philip Wilk +Date: Sun, 23 Mar 2025 16:14:51 +0000 +Subject: [PATCH] StackingCVClassifier/fit: ensure compatibility with + *scikit-learn* versions 1.4 and above by dynamically selecting between + `fit_params` and `params` + +--- + mlxtend/classifier/stacking_cv_classification.py | 5 ++++- + mlxtend/regressor/stacking_cv_regression.py | 6 +++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/mlxtend/classifier/stacking_cv_classification.py b/mlxtend/classifier/stacking_cv_classification.py +index 5bff6907..f4c45b8c 100644 +--- a/mlxtend/classifier/stacking_cv_classification.py ++++ b/mlxtend/classifier/stacking_cv_classification.py +@@ -15,6 +15,7 @@ from sklearn.base import TransformerMixin, clone + from sklearn.model_selection import cross_val_predict + from sklearn.model_selection._split import check_cv + from sklearn.preprocessing import LabelEncoder ++from sklearn import __version__ as sklearn_version + + from ..externals.estimator_checks import check_is_fitted + from ..externals.name_estimators import _name_estimators +@@ -266,6 +267,8 @@ class StackingCVClassifier( + if self.verbose > 1: + print(_name_estimators((model,))[0][1]) + ++ param_name = "fit_params" if sklearn_version < "1.4" else "params" ++ + prediction = cross_val_predict( + model, + X, +@@ -273,10 +276,10 @@ class StackingCVClassifier( + groups=groups, + cv=final_cv, + n_jobs=self.n_jobs, +- fit_params=fit_params, + verbose=self.verbose, + pre_dispatch=self.pre_dispatch, + method="predict_proba" if self.use_probas else "predict", ++ **{param_name: fit_params}, + ) + + if not self.use_probas: +diff --git a/mlxtend/regressor/stacking_cv_regression.py b/mlxtend/regressor/stacking_cv_regression.py +index a1faf2ff..d2fb1c49 100644 +--- a/mlxtend/regressor/stacking_cv_regression.py ++++ b/mlxtend/regressor/stacking_cv_regression.py +@@ -19,6 +19,7 @@ from sklearn.base import RegressorMixin, TransformerMixin, clone + from sklearn.model_selection import cross_val_predict + from sklearn.model_selection._split import check_cv + from sklearn.utils import check_X_y ++from sklearn import __version__ as sklearn_version + + from ..externals.estimator_checks import check_is_fitted + from ..externals.name_estimators import _name_estimators +@@ -211,6 +212,9 @@ class StackingCVRegressor(_BaseXComposition, RegressorMixin, TransformerMixin): + fit_params = None + else: + fit_params = dict(sample_weight=sample_weight) ++ ++ param_name = "fit_params" if sklearn_version < "1.4" else "params" ++ + meta_features = np.column_stack( + [ + cross_val_predict( +@@ -221,8 +225,8 @@ class StackingCVRegressor(_BaseXComposition, RegressorMixin, TransformerMixin): + cv=kfold, + verbose=self.verbose, + n_jobs=self.n_jobs, +- fit_params=fit_params, + pre_dispatch=self.pre_dispatch, ++ **{param_name: fit_params}, + ) + for regr in self.regr_ + ] +-- +2.47.1 + diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index d6e970dbd719..559d54c01758 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -38,6 +38,11 @@ buildPythonPackage rec { joblib ]; + patches = [ + # https://github.com/rasbt/mlxtend/issues/1117 + ./0001-StackingCVClassifier-fit-ensure-compatibility-with-s.patch + ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "-sv" ]; From 9891bef5073b7e2d25a08b336aa5551e663db58c Mon Sep 17 00:00:00 2001 From: Philip Wilk Date: Sun, 23 Mar 2025 17:31:41 +0000 Subject: [PATCH 04/92] python3Packages.mlxtend: disable failing tests test_ensemble_vote_classifier, test_stacking_classifier, test_stacking_cv_classifier --- pkgs/development/python-modules/mlxtend/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 559d54c01758..db5689580279 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -59,6 +59,10 @@ buildPythonPackage rec { "mlxtend/evaluate/tests/test_feature_importance.py" # urlopen error "mlxtend/evaluate/tests/test_bias_variance_decomp.py" # keras.api._v2 "mlxtend/evaluate/tests/test_bootstrap_point632.py" # keras.api._v2 + # Failing tests, most likely an upstream issue. See https://github.com/rasbt/mlxtend/issues/1117 + "mlxtend/classifier/tests/test_ensemble_vote_classifier.py" + "mlxtend/classifier/tests/test_stacking_classifier.py" + "mlxtend/classifier/tests/test_stacking_cv_classifier.py" ]; meta = { From f1cbb85ee1eb99f100d90f1c8a1ac467452080e4 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Mon, 28 Apr 2025 19:41:37 +0200 Subject: [PATCH 05/92] ares: 143 -> 144 --- pkgs/by-name/ar/ares/darwin-build-fixes.patch | 35 +++++++++++++------ pkgs/by-name/ar/ares/package.nix | 13 ++++--- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/ar/ares/darwin-build-fixes.patch b/pkgs/by-name/ar/ares/darwin-build-fixes.patch index e0fe64bc94da..96b07f2ee141 100644 --- a/pkgs/by-name/ar/ares/darwin-build-fixes.patch +++ b/pkgs/by-name/ar/ares/darwin-build-fixes.patch @@ -1,18 +1,18 @@ diff --git a/cmake/macos/compilerconfig.cmake b/cmake/macos/compilerconfig.cmake -index 99272c662..50f94db37 100644 +index f0c900f28..4da64f0b3 100644 --- a/cmake/macos/compilerconfig.cmake +++ b/cmake/macos/compilerconfig.cmake -@@ -27,7 +27,7 @@ message(DEBUG "macOS SDK Path: ${CMAKE_OSX_SYSROOT}") - string(REGEX MATCH ".+/SDKs/MacOSX([0-9]+\\.[0-9])+\\.sdk$" _ ${CMAKE_OSX_SYSROOT}) - set(_ares_macos_current_sdk ${CMAKE_MATCH_1}) - message(DEBUG "macOS SDK version: ${_ares_macos_current_sdk}") --if(_ares_macos_current_sdk VERSION_LESS _ares_macos_minimum_sdk) -+if(FALSE) - message( - FATAL_ERROR - "Your macOS SDK version (${_ares_macos_current_sdk}) is too low. " +@@ -25,7 +25,7 @@ function(check_sdk_requirements) + set(ares_macos_minimum_sdk 11.1) # Minimum tested SDK + set(ares_macos_minimum_xcode 12.4) # Sync with SDK + execute_process( +- COMMAND xcrun --sdk macosx --show-sdk-platform-version ++ COMMAND echo @sdkVersion@ + OUTPUT_VARIABLE ares_macos_current_sdk + RESULT_VARIABLE result + OUTPUT_STRIP_TRAILING_WHITESPACE diff --git a/cmake/macos/helpers.cmake b/cmake/macos/helpers.cmake -index 864a629f0..f455345bf 100644 +index 3777ac98a..07ff17009 100644 --- a/cmake/macos/helpers.cmake +++ b/cmake/macos/helpers.cmake @@ -35,7 +35,6 @@ function(ares_configure_executable target) @@ -23,3 +23,16 @@ index 864a629f0..f455345bf 100644 install(TARGETS ${target} BUNDLE DESTINATION "." COMPONENT Application) endif() +diff --git a/ruby/cmake/os-macos.cmake b/ruby/cmake/os-macos.cmake +index 39c339428..dafb58c66 100644 +--- a/ruby/cmake/os-macos.cmake ++++ b/ruby/cmake/os-macos.cmake +@@ -43,7 +43,7 @@ target_link_libraries( + if(SDL_FOUND) + target_link_libraries( + ruby +- PRIVATE "$" ++ PRIVATE "$" + ) + endif() + diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix index e917588264c8..84eaaf6f3d49 100644 --- a/pkgs/by-name/ar/ares/package.nix +++ b/pkgs/by-name/ar/ares/package.nix @@ -1,6 +1,5 @@ { lib, - SDL2, alsa-lib, apple-sdk_14, cmake, @@ -19,6 +18,8 @@ moltenvk, openal, pkg-config, + replaceVars, + sdl3, stdenv, udev, vulkan-loader, @@ -28,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ares"; - version = "143"; + version = "144"; src = fetchFromGitHub { owner = "ares-emulator"; repo = "ares"; tag = "v${finalAttrs.version}"; - hash = "sha256-uuFKbS7WvxkTyyQfuQ6iKPvRt+54zUPdjUlQ/ohBAr8="; + hash = "sha256-BpVyPdtsIUstLVf/HGO6vcAlLgJP5SgJbZtqEV/uJ2g="; }; nativeBuildInputs = @@ -49,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ - SDL2 + sdl3 libao librashader vulkan-loader @@ -73,7 +74,9 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - ./darwin-build-fixes.patch + (replaceVars ./darwin-build-fixes.patch { + sdkVersion = apple-sdk_14.version; + }) ]; cmakeFlags = [ From 61e61a59eb99affecc383f18250928c0eb76f21f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 1 May 2025 21:32:10 +0100 Subject: [PATCH 06/92] nixos-rebuild-ng: kill underlying remote process `nixos-rebuild-ng` explicitly don't allocate a pseudo-TTY for SSH because this causes lots of issues depending on the use case (for example, multiplexing multiple SSH sessions). Sadly not using a pseudo-TTY also cause other issues, like the fact that using Ctrl+C (SIGINT) doesn't kill the underlying process because SSH doesn't support it. We can't really start using pseudo-TTY unless we want to overcomplicate the code for parsing results (pseudo-TTY mangles the stdout/stderr together), so we need to handle killing the underlying remote process manually. This is what this commit does, when we receive a `KeyboardInterrupt` exception while calling `run_wrapper`, we will check if it is a remote process and send a `pkill --full` with the arguments (this should ensure that we don't kill other process, but we can't guarantee it). This assumes the user has `procps` installed, but I think it is a safe assumption since this seems to be a core package. Sadly nothing we can do if the user doesn't have `procps` installed, the good thing is that the worst that can happen is that we will silent fail and the process will stay in background until it finishes. Fix #403269. --- .../src/nixos_rebuild/process.py | 67 ++++++++++++++++--- .../src/tests/test_process.py | 31 +++++++++ 2 files changed, 90 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py index de37bd615512..b21010f54f40 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py @@ -1,6 +1,7 @@ import atexit import logging import os +import re import shlex import subprocess from collections.abc import Sequence @@ -21,6 +22,8 @@ SSH_DEFAULT_OPTS: Final = [ "ControlPersist=60", ] +type Args = Sequence[str | bytes | os.PathLike[str] | os.PathLike[bytes]] + @dataclass(frozen=True) class Remote: @@ -82,7 +85,7 @@ atexit.register(cleanup_ssh) def run_wrapper( - args: Sequence[str | bytes | os.PathLike[str] | os.PathLike[bytes]], + args: Args, *, check: bool = True, extra_env: dict[str, str] | None = None, @@ -93,6 +96,8 @@ def run_wrapper( "Wrapper around `subprocess.run` that supports extra functionality." env = None process_input = None + run_args = args + if remote: if extra_env: extra_env_args = [f"{env}={value}" for env, value in extra_env.items()] @@ -103,7 +108,7 @@ def run_wrapper( process_input = remote.sudo_password + "\n" else: args = ["sudo", *args] - args = [ + run_args = [ "ssh", *remote.opts, *SSH_DEFAULT_OPTS, @@ -119,32 +124,39 @@ def run_wrapper( if extra_env: env = os.environ | extra_env if sudo: - args = ["sudo", *args] + run_args = ["sudo", *run_args] logger.debug( "calling run with args=%r, kwargs=%r, extra_env=%r", - args, + run_args, kwargs, extra_env, ) try: r = subprocess.run( - args, + run_args, check=check, env=env, input=process_input, - # Hope nobody is using NixOS with non-UTF8 encodings, but "surrogateescape" - # should still work in those systems. + # Hope nobody is using NixOS with non-UTF8 encodings, but + # "surrogateescape" should still work in those systems. text=True, errors="surrogateescape", **kwargs, ) if kwargs.get("capture_output") or kwargs.get("stderr") or kwargs.get("stdout"): - logger.debug("captured output stdout=%r, stderr=%r", r.stdout, r.stderr) + logger.debug( + "captured output with stdout=%r, stderr=%r", r.stdout, r.stderr + ) return r + except KeyboardInterrupt: + # sudo commands are activation only and unlikely to be long running + if remote and not sudo: + _kill_long_running_ssh_process(args, remote) + raise except subprocess.CalledProcessError: if sudo and remote and remote.sudo_password is None: logger.error( @@ -152,3 +164,42 @@ def run_wrapper( + "--ask-sudo-password?" ) raise + + +# SSH does not send the signals to the process when running without usage of +# pseudo-TTY (that causes a whole other can of worms), so if the process is +# long running (e.g.: a build) this will result in the underlying process +# staying alive. +# See: https://stackoverflow.com/a/44354466 +# Issue: https://github.com/NixOS/nixpkgs/issues/403269 +def _kill_long_running_ssh_process(args: Args, remote: Remote) -> None: + logger.info("cleaning-up remote process, please wait...") + + # We need to escape both the shell and regex here (since pkill interprets + # its arguments as regex) + quoted_args = re.escape(shlex.join(str(a) for a in args)) + logger.debug("killing remote process using pkill with args=%r", quoted_args) + r = subprocess.run( + [ + "ssh", + *remote.opts, + *SSH_DEFAULT_OPTS, + remote.host, + "--", + "pkill", + "--signal", + "SIGINT", + "--full", + "--", + quoted_args, + ], + check=False, + capture_output=True, + text=True, + ) + logger.debug( + "remote pkill captured output with stdout=%r, stderr=%r, returncode=%s", + r.stdout, + r.stderr, + r.returncode, + ) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py index 6458f54c06ef..8ac92bb4848b 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py @@ -96,6 +96,37 @@ def test_run(mock_run: Any) -> None: ) +@patch(get_qualified_name(p.subprocess.run), autospec=True) +def test__kill_long_running_ssh_process(mock_run: Any) -> None: + p._kill_long_running_ssh_process( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "build", + "/nix/store/la0c8nmpr9xfclla0n4f3qq9iwgdrq4g-nixos-system-sankyuu-nixos-25.05.20250424.f771eb4.drv^*", + ], + m.Remote("user@localhost", opts=[], sudo_password=None), + ) + mock_run.assert_called_with( + [ + "ssh", + *p.SSH_DEFAULT_OPTS, + "user@localhost", + "--", + "pkill", + "--signal", + "SIGINT", + "--full", + "--", + r"nix\ \-\-extra\-experimental\-features\ 'nix\-command\ flakes'\ build\ '/nix/store/la0c8nmpr9xfclla0n4f3qq9iwgdrq4g\-nixos\-system\-sankyuu\-nixos\-25\.05\.20250424\.f771eb4\.drv\^\*'", + ], + check=False, + capture_output=True, + text=True, + ) + + def test_remote_from_name(monkeypatch: MonkeyPatch) -> None: monkeypatch.setenv("NIX_SSHOPTS", "") assert m.Remote.from_arg("user@localhost", None, False) == m.Remote( From 062eaf7379974675dc6c00445f29ce2a4753db0b Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 2 May 2025 09:48:51 +0100 Subject: [PATCH 07/92] nixos-rebuild-ng: alert user if we can't clean-up remote process --- .../src/nixos_rebuild/process.py | 61 +++++++++++-------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py index b21010f54f40..d6d798fdc62d 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py @@ -179,27 +179,40 @@ def _kill_long_running_ssh_process(args: Args, remote: Remote) -> None: # its arguments as regex) quoted_args = re.escape(shlex.join(str(a) for a in args)) logger.debug("killing remote process using pkill with args=%r", quoted_args) - r = subprocess.run( - [ - "ssh", - *remote.opts, - *SSH_DEFAULT_OPTS, - remote.host, - "--", - "pkill", - "--signal", - "SIGINT", - "--full", - "--", - quoted_args, - ], - check=False, - capture_output=True, - text=True, - ) - logger.debug( - "remote pkill captured output with stdout=%r, stderr=%r, returncode=%s", - r.stdout, - r.stderr, - r.returncode, - ) + cleanup_interrupted = False + + try: + r = subprocess.run( + [ + "ssh", + *remote.opts, + *SSH_DEFAULT_OPTS, + remote.host, + "--", + "pkill", + "--signal", + "SIGINT", + "--full", + "--", + quoted_args, + ], + check=False, + capture_output=True, + text=True, + ) + logger.debug( + "remote pkill captured output with stdout=%r, stderr=%r, returncode=%s", + r.stdout, + r.stderr, + r.returncode, + ) + except KeyboardInterrupt: + cleanup_interrupted = True + raise + finally: + if cleanup_interrupted or r.returncode: + logger.warning( + "could not clean-up remote process, the command %s may still be running in host '%s'", + args, + remote.host, + ) From 2e06b6da564f481031f4a5045a637673effcd87f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 2 May 2025 12:56:07 +0100 Subject: [PATCH 08/92] nixos-rebuild-ng: mark logger as Final --- .../by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 4 ++-- pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py | 2 +- pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 173462767b05..fd03e5b69ef4 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -5,7 +5,7 @@ import os import sys from pathlib import Path from subprocess import CalledProcessError, run -from typing import assert_never +from typing import Final, assert_never from . import nix, tmpdir from .constants import EXECUTABLE, WITH_NIX_2_18, WITH_REEXEC, WITH_SHELL_FILES @@ -13,7 +13,7 @@ from .models import Action, BuildAttr, Flake, ImageVariants, NRError, Profile from .process import Remote, cleanup_ssh from .utils import Args, LogFormatter, tabulate -logger = logging.getLogger() +logger: Final = logging.getLogger() logger.setLevel(logging.INFO) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index 8ea339e7b064..0929cf7fe4aa 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -45,7 +45,7 @@ SWITCH_TO_CONFIGURATION_CMD_PREFIX: Final = [ "--service-type=exec", "--unit=nixos-rebuild-switch-to-configuration", ] -logger = logging.getLogger(__name__) +logger: Final = logging.getLogger(__name__) def build( diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py index d6d798fdc62d..0c556411331e 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py @@ -11,7 +11,7 @@ from typing import Final, Self, TypedDict, Unpack from . import tmpdir -logger = logging.getLogger(__name__) +logger: Final = logging.getLogger(__name__) SSH_DEFAULT_OPTS: Final = [ "-o", From b74e861c28643c55b7cc4bf909cd91cb907bb790 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 2 May 2025 12:58:33 +0100 Subject: [PATCH 09/92] nixos-rebuild-ng: use Final in constants.py --- .../ni/nixos-rebuild-ng/src/nixos_rebuild/constants.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/constants.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/constants.py index f879130f0336..ef706af7b342 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/constants.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/constants.py @@ -1,9 +1,11 @@ +from typing import Final + # Build-time flags # Use strings to avoid breaking standalone (e.g.: `python -m nixos_rebuild`) # usage -EXECUTABLE = "@executable@" +EXECUTABLE: Final[str] = "@executable@" # Use either `== "true"` if the default (e.g.: `python -m nixos_rebuild`) is # `False` or `!= "false"` if the default is `True` -WITH_NIX_2_18 = "@withNix218@" != "false" # type: ignore -WITH_REEXEC = "@withReexec@" == "true" # type: ignore -WITH_SHELL_FILES = "@withShellFiles@" == "true" # type: ignore +WITH_NIX_2_18: Final[bool] = "@withNix218@" != "false" +WITH_REEXEC: Final[bool] = "@withReexec@" == "true" +WITH_SHELL_FILES: Final[bool] = "@withShellFiles@" == "true" From c570df851d69504e4383235b2ed382dbcd991beb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joel=20H=C3=B6ner?= Date: Sun, 16 Feb 2025 01:35:56 +0100 Subject: [PATCH 10/92] uefitoolPackages.new-engine: A62 -> A71 This commit upgrades uefiToolPackages.new-engine to the latest version as of writing. Version A68 is now using Qt6 and no longer comes with a custom build script, so the build logic compared to the old-engine variant has become sufficiently divergent that I decided that it would be easier to split them into two entirely different derivations. Additionally, I: - added myself as a maintainer - added a patch that allows the new-engine variant to build on Darwin - correctly set `mainProgram` in the old-engine variant --- .../system/uefitool/bundle-destination.patch | 17 +++++++++ pkgs/tools/system/uefitool/new-engine.nix | 38 +++++++++++++++++++ .../uefitool/{common.nix => old-engine.nix} | 29 +++++--------- pkgs/tools/system/uefitool/variants.nix | 27 ++----------- 4 files changed, 69 insertions(+), 42 deletions(-) create mode 100644 pkgs/tools/system/uefitool/bundle-destination.patch create mode 100644 pkgs/tools/system/uefitool/new-engine.nix rename pkgs/tools/system/uefitool/{common.nix => old-engine.nix} (62%) diff --git a/pkgs/tools/system/uefitool/bundle-destination.patch b/pkgs/tools/system/uefitool/bundle-destination.patch new file mode 100644 index 000000000000..1087d497ba70 --- /dev/null +++ b/pkgs/tools/system/uefitool/bundle-destination.patch @@ -0,0 +1,17 @@ +--- + UEFITool/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/UEFITool/CMakeLists.txt b/UEFITool/CMakeLists.txt +index aef60d0..98723ac 100644 +--- a/UEFITool/CMakeLists.txt ++++ b/UEFITool/CMakeLists.txt +@@ -143,4 +143,4 @@ IF(UNIX AND (NOT APPLE) AND (NOT CYGWIN)) + INSTALL(FILES uefitool.desktop DESTINATION share/applications) + ENDIF() + +-INSTALL(TARGETS UEFITool BUNDLE DESTINATION "/Applications" ) ++INSTALL(TARGETS UEFITool BUNDLE DESTINATION "Applications" ) +-- +2.40.1 + diff --git a/pkgs/tools/system/uefitool/new-engine.nix b/pkgs/tools/system/uefitool/new-engine.nix new file mode 100644 index 000000000000..a7d908493728 --- /dev/null +++ b/pkgs/tools/system/uefitool/new-engine.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, + qtbase, + cmake, + wrapQtAppsHook, + zip, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "uefitool"; + version = "A71"; + + src = fetchFromGitHub { + hash = "sha256-NRlrKm5+eED6oyvFRSEhn0EUbMsPJtuFAyv3vgY/IUI="; + owner = "LongSoft"; + repo = "uefitool"; + tag = finalAttrs.version; + }; + + buildInputs = [ qtbase ]; + nativeBuildInputs = [ + cmake + zip + wrapQtAppsHook + ]; + patches = lib.optionals stdenv.isDarwin [ ./bundle-destination.patch ]; + + meta = { + description = "UEFI firmware image viewer and editor"; + homepage = "https://github.com/LongSoft/uefitool"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ athre0z ]; + platforms = lib.platforms.unix; + mainProgram = "uefitool"; + }; +}) diff --git a/pkgs/tools/system/uefitool/common.nix b/pkgs/tools/system/uefitool/old-engine.nix similarity index 62% rename from pkgs/tools/system/uefitool/common.nix rename to pkgs/tools/system/uefitool/old-engine.nix index fa8da1a9ac8a..ba22a2348cc1 100644 --- a/pkgs/tools/system/uefitool/common.nix +++ b/pkgs/tools/system/uefitool/old-engine.nix @@ -1,8 +1,3 @@ -{ - version, - sha256, - installFiles, -}: { lib, mkDerivation, @@ -14,19 +9,14 @@ }: mkDerivation rec { - passthru = { - inherit version; - inherit sha256; - inherit installFiles; - }; pname = "uefitool"; - inherit version; + version = "0.28.0"; src = fetchFromGitHub { - inherit sha256; + hash = "sha256-StqrOMsKst2X2yQQ/Xl7iLAuA4QXEOyj2KtE7ZtoUNg="; owner = "LongSoft"; - repo = pname; - rev = version; + repo = "uefitool"; + tag = version; }; buildInputs = [ qtbase ]; @@ -43,15 +33,16 @@ mkDerivation rec { installPhase = '' mkdir -p "$out"/bin - cp ${lib.concatStringsSep " " installFiles} "$out"/bin + cp UEFITool UEFIReplace/UEFIReplace UEFIPatch/UEFIPatch "$out"/bin ''; - meta = with lib; { + meta = { description = "UEFI firmware image viewer and editor"; homepage = "https://github.com/LongSoft/uefitool"; - license = licenses.bsd2; - maintainers = [ ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ athre0z ]; # uefitool supposedly works on other platforms, but their build script only works on linux in nixpkgs - platforms = platforms.linux; + platforms = lib.platforms.linux; + mainProgram = "UEFITool"; }; } diff --git a/pkgs/tools/system/uefitool/variants.nix b/pkgs/tools/system/uefitool/variants.nix index 851338497472..173113e1ca66 100644 --- a/pkgs/tools/system/uefitool/variants.nix +++ b/pkgs/tools/system/uefitool/variants.nix @@ -1,24 +1,5 @@ -{ libsForQt5 }: -let - common = opts: libsForQt5.callPackage (import ./common.nix opts) { }; -in -rec { - new-engine = common { - version = "A62"; - sha256 = "sha256-U89j0BV57luv1c9hoYJtisKLxFezuaGFokZ29/NJ0xg="; - installFiles = [ - "build/UEFITool/UEFITool" - "build/UEFIFind/UEFIFind" - "build/UEFIExtract/UEFIExtract" - ]; - }; - old-engine = common rec { - version = "0.28.0"; - sha256 = "1n2hd2dysi5bv2iyq40phh1jxc48gdwzs414vfbxvcharcwapnja"; - installFiles = [ - "UEFITool" - "UEFIReplace/UEFIReplace" - "UEFIPatch/UEFIPatch" - ]; - }; +{ libsForQt5, qt6Packages }: +{ + new-engine = qt6Packages.callPackage ./new-engine.nix { }; + old-engine = libsForQt5.callPackage ./old-engine.nix { }; } From 47adab9257aee0c871f99f4aa9bfc7d962c0c197 Mon Sep 17 00:00:00 2001 From: Mattias Cockburn Date: Thu, 8 May 2025 00:09:48 +0200 Subject: [PATCH 11/92] zarf: 0.41.0 -> 0.54.0 --- pkgs/by-name/za/zarf/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/za/zarf/package.nix b/pkgs/by-name/za/zarf/package.nix index 328b64a53e99..ad9d25b60d3a 100644 --- a/pkgs/by-name/za/zarf/package.nix +++ b/pkgs/by-name/za/zarf/package.nix @@ -8,10 +8,10 @@ buildGoModule rec { pname = "zarf"; - version = "0.41.0"; + version = "0.54.0"; src = fetchFromGitHub { - owner = "defenseunicorns"; + owner = "zarf-dev"; repo = "zarf"; rev = "v${version}"; hash = "sha256-rY9xWqJ+2Yfs6VRHTF89LmuEruAavDI7MgBm4UFEuBs="; @@ -33,7 +33,7 @@ buildGoModule rec { "-s" "-w" "-X" - "github.com/defenseunicorns/zarf/src/config.CLIVersion=${src.rev}" + "github.com/zarf-dev/zarf/src/config.CLIVersion=${src.rev}" "-X" "k8s.io/component-base/version.gitVersion=v0.0.0+zarf${src.rev}" "-X" @@ -53,7 +53,7 @@ buildGoModule rec { meta = with lib; { description = "DevSecOps for Air Gap & Limited-Connection Systems. https://zarf.dev"; mainProgram = "zarf"; - homepage = "https://github.com/defenseunicorns/zarf.git"; + homepage = "https://zarf.dev"; license = licenses.asl20; maintainers = with maintainers; [ ragingpastry ]; }; From 9a8379fc3a6ffcd4083cd9d730be948065a49bc7 Mon Sep 17 00:00:00 2001 From: pinpox Date: Fri, 9 May 2025 11:56:39 +0200 Subject: [PATCH 12/92] zk: 0.15.0 -> 0.15.1 --- pkgs/by-name/zk/zk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zk/zk/package.nix b/pkgs/by-name/zk/zk/package.nix index fe1116ccf1ef..f8470452dcc6 100644 --- a/pkgs/by-name/zk/zk/package.nix +++ b/pkgs/by-name/zk/zk/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "zk"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "zk-org"; repo = "zk"; rev = "v${version}"; - sha256 = "sha256-aFpn3luIp5tMp9jpBxVCmU+IU9eJg3/5UZFIklauFjI="; + sha256 = "sha256-h4q3GG4DPPEJk2G5JDbUhnHpqEdMAkGYSMs9TS5Goco="; }; vendorHash = "sha256-2PlaIw7NaW4pAVIituSVWhssSBKjowLOLuBV/wz829I="; From 680ad736264d122858db43807eae39bdfdacbb22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Thu, 8 May 2025 14:55:37 +0200 Subject: [PATCH 13/92] mt-st: 1.3 -> 1.8 Co-authored-by: emaryn <197520219+emaryn@users.noreply.github.com> --- pkgs/by-name/mt/mt-st/package.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/mt/mt-st/package.nix b/pkgs/by-name/mt/mt-st/package.nix index 532598a2e284..909bcd1afd51 100644 --- a/pkgs/by-name/mt/mt-st/package.nix +++ b/pkgs/by-name/mt/mt-st/package.nix @@ -1,21 +1,24 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, }: stdenv.mkDerivation rec { pname = "mt-st"; - version = "1.3"; + version = "1.8"; - src = fetchurl { - url = "https://github.com/iustin/mt-st/releases/download/mt-st-${version}/mt-st-${version}.tar.gz"; - sha256 = "b552775326a327cdcc076c431c5cbc4f4e235ac7c41aa931ad83f94cccb9f6de"; + src = fetchFromGitHub { + owner = "iustin"; + repo = "mt-st"; + tag = "v${version}"; + hash = "sha256-Sl+/v+ko3K4npY/M49H1YDxqOMy923qcAkTohi5Xg70="; }; installFlags = [ - "PREFIX=$(out)" - "EXEC_PREFIX=$(out)" + "PREFIX=" + "DESTDIR=$(out)" + "COMPLETIONINSTALLDIR=$(out)/share/bash-completion/completions" ]; meta = { From 48ccdb5d4e3329bb7c44d0ac6788a3de80cc3383 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 9 May 2025 21:42:10 +0200 Subject: [PATCH 14/92] tests.importCargoLock.*: remove usage of lib.fileset The usage of lib.fileset was forbidden in nixpkgs due to a bug in nix. For more information, see 8725e466ef2bcc5be69106c16dbf69b9ef989273 and the PR it was merged in #369694 --- .../basic-dynamic/default.nix | 17 ++++------------- .../basic-dynamic/{ => package}/Cargo.lock | 0 .../basic-dynamic/{ => package}/Cargo.toml | 0 .../basic-dynamic/{ => package}/src/main.rs | 0 .../import-cargo-lock/basic-sparse/default.nix | 18 ++++-------------- .../{ => package}/.cargo/config.toml | 0 .../basic-sparse/{ => package}/Cargo.lock | 0 .../basic-sparse/{ => package}/Cargo.toml | 0 .../basic-sparse/{ => package}/src/main.rs | 0 .../test/import-cargo-lock/basic/default.nix | 15 +++------------ .../basic/{ => package}/Cargo.lock | 0 .../basic/{ => package}/Cargo.toml | 0 .../basic/{ => package}/src/main.rs | 0 .../git-dependency-branch/default.nix | 17 ++++------------- .../{ => package}/Cargo.lock | 0 .../{ => package}/Cargo.toml | 0 .../{ => package}/src/main.rs | 0 .../default.nix | 16 +++------------- .../{ => package}/Cargo.lock | 0 .../{ => package}/Cargo.toml | 0 .../{ => package}/src/main.rs | 0 .../git-dependency-rev/default.nix | 17 ++++------------- .../{ => package}/Cargo.lock | 0 .../{ => package}/Cargo.toml | 0 .../{ => package}/src/main.rs | 0 .../git-dependency-tag/default.nix | 17 ++++------------- .../{ => package}/Cargo.lock | 0 .../{ => package}/Cargo.toml | 0 .../{ => package}/src/main.rs | 0 .../git-dependency/default.nix | 17 ++++------------- .../git-dependency/{ => package}/Cargo.lock | 0 .../git-dependency/{ => package}/Cargo.toml | 0 .../git-dependency/{ => package}/src/main.rs | 0 .../rust/test/import-cargo-lock/v1/default.nix | 17 ++++------------- .../v1/{ => package}/Cargo.lock | 0 .../v1/{ => package}/Cargo.toml | 0 .../v1/{ => package}/src/main.rs | 0 37 files changed, 34 insertions(+), 117 deletions(-) rename pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/{ => package}/Cargo.lock (100%) rename pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/{ => package}/Cargo.toml (100%) rename pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/{ => package}/src/main.rs (100%) rename pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/{ => package}/.cargo/config.toml (100%) rename pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/{ => package}/Cargo.lock (100%) rename pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/{ => package}/Cargo.toml (100%) rename pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/{ => package}/src/main.rs (100%) rename pkgs/build-support/rust/test/import-cargo-lock/basic/{ => package}/Cargo.lock (100%) rename pkgs/build-support/rust/test/import-cargo-lock/basic/{ => package}/Cargo.toml (100%) rename pkgs/build-support/rust/test/import-cargo-lock/basic/{ => package}/src/main.rs (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/{ => package}/Cargo.lock (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/{ => package}/Cargo.toml (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/{ => package}/src/main.rs (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/{ => package}/Cargo.lock (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/{ => package}/Cargo.toml (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/{ => package}/src/main.rs (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/{ => package}/Cargo.lock (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/{ => package}/Cargo.toml (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/{ => package}/src/main.rs (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/{ => package}/Cargo.lock (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/{ => package}/Cargo.toml (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/{ => package}/src/main.rs (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency/{ => package}/Cargo.lock (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency/{ => package}/Cargo.toml (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency/{ => package}/src/main.rs (100%) rename pkgs/build-support/rust/test/import-cargo-lock/v1/{ => package}/Cargo.lock (100%) rename pkgs/build-support/rust/test/import-cargo-lock/v1/{ => package}/Cargo.toml (100%) rename pkgs/build-support/rust/test/import-cargo-lock/v1/{ => package}/src/main.rs (100%) diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix index 105303201617..40dd67bb8302 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix @@ -1,21 +1,12 @@ -{ lib, rustPlatform }: -let - fs = lib.fileset; -in +{ rustPlatform }: + rustPlatform.buildRustPackage { pname = "basic-dynamic"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; - cargoLock.lockFileContents = builtins.readFile ./Cargo.lock; + cargoLock.lockFileContents = builtins.readFile ./package/Cargo.lock; doInstallCheck = true; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/package/src/main.rs diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/default.nix index 203badd86755..5bf1f12ee6bb 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/default.nix @@ -1,23 +1,13 @@ -{ lib, rustPlatform }: -let - fs = lib.fileset; -in +{ rustPlatform }: + rustPlatform.buildRustPackage { pname = "basic-sparse"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./.cargo/config.toml - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; extraRegistries = { "sparse+https://index.crates.io/" = "https://static.crates.io/crates"; }; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/.cargo/config.toml b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/.cargo/config.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/.cargo/config.toml rename to pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/.cargo/config.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/src/main.rs diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix index 325380977b88..7bcca6064f08 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix @@ -1,22 +1,13 @@ { lib, rustPlatform }: -let - fs = lib.fileset; -in + rustPlatform.buildRustPackage { pname = "basic"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; }; doInstallCheck = true; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/basic/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/basic/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/basic/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/basic/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/basic/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/basic/package/src/main.rs diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/default.nix index 3111c747d372..265c964ce0c9 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/default.nix @@ -1,22 +1,13 @@ -{ lib, rustPlatform }: -let - fs = lib.fileset; -in +{ rustPlatform }: + rustPlatform.buildRustPackage { pname = "git-dependency-branch"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; outputHashes = { "rand-0.8.4" = "1ilk9wvfw3mdm57g199ys8f5nrgdrh0n3a4c8b7nz6lgnqvfrv6z"; }; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/package/src/main.rs diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix index 6dac7a801284..f9a314f49d7a 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix @@ -3,23 +3,13 @@ pkg-config, openssl, zlib, - lib, }: -let - fs = lib.fileset; -in + rustPlatform.buildRustPackage { pname = "git-dependency-rev-non-workspace-nested-crate"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; nativeBuildInputs = [ pkg-config @@ -31,7 +21,7 @@ rustPlatform.buildRustPackage { ]; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; outputHashes = { "cargo-test-macro-0.1.0" = "1yy1y1d523xdzwg1gc77pigbcwsbawmy4b7vw8v21m7q957sk0c4"; }; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/package/src/main.rs diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/default.nix index d3cb0fa7df81..34eb36941576 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/default.nix @@ -1,22 +1,13 @@ -{ lib, rustPlatform }: -let - fs = lib.fileset; -in +{ rustPlatform }: + rustPlatform.buildRustPackage { pname = "git-dependency-rev"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; outputHashes = { "rand-0.8.3" = "0l3p174bpwia61vcvxz5mw65a13ri3wy94z04xrnyy5lzciykz4f"; }; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/package/src/main.rs diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/default.nix index dfaa1e3028da..d0d267a40cae 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/default.nix @@ -1,22 +1,13 @@ -{ lib, rustPlatform }: -let - fs = lib.fileset; -in +{ rustPlatform }: + rustPlatform.buildRustPackage { pname = "git-dependency-tag"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; outputHashes = { "rand-0.8.3" = "0l3p174bpwia61vcvxz5mw65a13ri3wy94z04xrnyy5lzciykz4f"; }; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/package/src/main.rs diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix index 98aa35bf8e1d..5f1a060268bf 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix @@ -1,22 +1,13 @@ -{ lib, rustPlatform }: -let - fs = lib.fileset; -in +{ rustPlatform }: + rustPlatform.buildRustPackage { pname = "git-dependency"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; outputHashes = { "rand-0.8.3" = "0ya2hia3cn31qa8894s3av2s8j5bjwb6yq92k0jsnlx7jid0jwqa"; }; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency/package/src/main.rs diff --git a/pkgs/build-support/rust/test/import-cargo-lock/v1/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/v1/default.nix index b53b7113590c..9b9228e5696d 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/v1/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/v1/default.nix @@ -1,22 +1,13 @@ -{ lib, rustPlatform }: -let - fs = lib.fileset; -in +{ rustPlatform }: + rustPlatform.buildRustPackage { pname = "v1"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; }; doInstallCheck = true; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/v1/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/v1/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/v1/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/v1/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/v1/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/v1/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/v1/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/v1/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/v1/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/v1/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/v1/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/v1/package/src/main.rs From 948c3f5e2ce69f7b321f3f4a9c8f771438336214 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 10 May 2025 17:30:44 +0200 Subject: [PATCH 15/92] openssl: don't create `separateDebugInfo` on android This causes an infinite recursion when evaling tests.cross.gcc.file.aarch64-android --- pkgs/development/libraries/openssl/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 465f24ec2630..50d2c25e56f2 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -98,7 +98,10 @@ let ++ lib.optional static "etc"; setOutputFlags = false; separateDebugInfo = - !stdenv.hostPlatform.isDarwin && !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU; + !stdenv.hostPlatform.isDarwin + && !stdenv.hostPlatform.isAndroid + && !(stdenv.hostPlatform.useLLVM or false) + && stdenv.cc.isGNU; nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isWindows) makeBinaryWrapper From 16187b11753d2992e1d043809bf5cba2418b78fb Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 9 May 2025 21:44:06 +0200 Subject: [PATCH 16/92] tests.config.allowPkgsInPermittedInsecurePackages: set system The called function defaults to `builtins.currentSystem` which does not work in pure-eval --- pkgs/test/config.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/test/config.nix b/pkgs/test/config.nix index 91cb312b4be0..0f24130efc65 100644 --- a/pkgs/test/config.nix +++ b/pkgs/test/config.nix @@ -1,4 +1,8 @@ -{ lib, ... }: +{ + lib, + pkgs, + ... +}: lib.recurseIntoAttrs { # https://github.com/NixOS/nixpkgs/issues/175196 @@ -11,13 +15,14 @@ lib.recurseIntoAttrs { # Instead of `builtins.seq`, the list may be constructed based on actual package info. allowPkgsInPermittedInsecurePackages = let - pkgs = import ../.. { + pkgs' = import ../.. { + system = pkgs.stdenv.hostPlatform.system; config = { - permittedInsecurePackages = builtins.seq pkgs.glibc.version [ ]; + permittedInsecurePackages = builtins.seq pkgs'.glibc.version [ ]; }; }; in - pkgs.hello; + pkgs'.hello; } From b494b7ed40435689165c70be2d24d7b10ab0ff24 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 9 May 2025 21:47:42 +0200 Subject: [PATCH 17/92] tests.stdenv: remove `__attrsFailEvaluation` These attrs do not fail to Eval on Darwin anymore --- pkgs/test/stdenv/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix index e0f868b25519..c961d37f409d 100644 --- a/pkgs/test/stdenv/default.nix +++ b/pkgs/test/stdenv/default.nix @@ -220,9 +220,6 @@ let in { - # Disable on Darwin due to assumptions with __bootPackages - __attrsFailEvaluation = stdenv.hostPlatform.isDarwin; - # tests for hooks in `stdenv.defaultNativeBuildInputs` hooks = lib.recurseIntoAttrs ( import ./hooks.nix { From 72a87bc217f5b673f3f488d78b634c368aef99b9 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 9 May 2025 21:50:39 +0200 Subject: [PATCH 18/92] tests.cross: remove `__attrsFailEvaluation` These attrs do not currently fail eval --- pkgs/test/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index dfeeef7fcf4f..cb46583f9c1e 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -138,9 +138,7 @@ with pkgs; ld-library-path = callPackage ./ld-library-path { }; - cross = callPackage ./cross { } // { - __attrsFailEvaluation = true; - }; + cross = callPackage ./cross { }; php = recurseIntoAttrs (callPackages ./php { }); From 33964ab8ba0d110bdeeea6e51bcab74fd224990d Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 9 May 2025 21:52:50 +0200 Subject: [PATCH 19/92] tests: recurse into more attrs This makes it so that our ci evals more tests and that hydra builds them, making it possible to catch more regressions. --- pkgs/build-support/writers/test.nix | 2 +- pkgs/test/cross/default.nix | 54 ++++++++++++++++------------- pkgs/test/default.nix | 42 ++++++++++++---------- 3 files changed, 54 insertions(+), 44 deletions(-) diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index 47c35ef5448f..d0359bbc38dc 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -456,7 +456,7 @@ recurseIntoAttrs { ); }; - data = { + data = recurseIntoAttrs { json = expectDataEqual { file = writeJSON "data.json" { hello = "world"; }; expected = '' diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index f1696c915c34..c12682af08c1 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -71,30 +71,32 @@ let mapMultiPlatformTest = crossSystemFun: test: - lib.mapAttrs ( - name: system: - test rec { - crossPkgs = import pkgs.path { - localSystem = { inherit (pkgs.stdenv.hostPlatform) config; }; - crossSystem = crossSystemFun system; - }; + lib.recurseIntoAttrs ( + lib.mapAttrs ( + name: system: + lib.recurseIntoAttrs (test rec { + crossPkgs = import pkgs.path { + localSystem = { inherit (pkgs.stdenv.hostPlatform) config; }; + crossSystem = crossSystemFun system; + }; - emulator = crossPkgs.stdenv.hostPlatform.emulator pkgs; + emulator = crossPkgs.stdenv.hostPlatform.emulator pkgs; - # Apply some transformation on windows to get dlls in the right - # place. Unfortunately mingw doesn’t seem to be able to do linking - # properly. - platformFun = - pkg: - if crossPkgs.stdenv.hostPlatform.isWindows then - pkgs.buildEnv { - name = "${pkg.name}-winlinks"; - paths = [ pkg ] ++ pkg.buildInputs; - } - else - pkg; - } - ) testedSystems; + # Apply some transformation on windows to get dlls in the right + # place. Unfortunately mingw doesn’t seem to be able to do linking + # properly. + platformFun = + pkg: + if crossPkgs.stdenv.hostPlatform.isWindows then + pkgs.buildEnv { + name = "${pkg.name}-winlinks"; + paths = [ pkg ] ++ pkg.buildInputs; + } + else + pkg; + }) + ) testedSystems + ); tests = { @@ -214,8 +216,12 @@ let in { - gcc = (lib.mapAttrs (_: mapMultiPlatformTest (system: system // { useLLVM = false; })) tests); - llvm = (lib.mapAttrs (_: mapMultiPlatformTest (system: system // { useLLVM = true; })) tests); + gcc = lib.recurseIntoAttrs ( + lib.mapAttrs (_: mapMultiPlatformTest (system: system // { useLLVM = false; })) tests + ); + llvm = lib.recurseIntoAttrs ( + lib.mapAttrs (_: mapMultiPlatformTest (system: system // { useLLVM = true; })) tests + ); inherit mbuffer sanity; } diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index cb46583f9c1e..4927898fa0dc 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -87,13 +87,13 @@ with pkgs; }; llvmTests = recurseIntoAttrs llvmTests; - inherit gccTests; + gccTests = recurseIntoAttrs gccTests; }; devShellTools = callPackage ../build-support/dev-shell-tools/tests { }; stdenv-inputs = callPackage ./stdenv-inputs { }; - stdenv = callPackage ./stdenv { }; + stdenv = recurseIntoAttrs (callPackage ./stdenv { }); hardeningFlags = recurseIntoAttrs (callPackage ./cc-wrapper/hardening.nix { }); hardeningFlags-gcc = recurseIntoAttrs ( @@ -113,24 +113,28 @@ with pkgs; haskell = callPackage ./haskell { }; - hooks = callPackage ./hooks { }; + hooks = recurseIntoAttrs (callPackage ./hooks { }); cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; compress-drv = callPackage ../build-support/compress-drv/test.nix { }; - fetchurl = callPackages ../build-support/fetchurl/tests.nix { }; - fetchtorrent = callPackages ../build-support/fetchtorrent/tests.nix { }; - fetchpatch = callPackages ../build-support/fetchpatch/tests.nix { }; - fetchpatch2 = callPackages ../build-support/fetchpatch/tests.nix { fetchpatch = fetchpatch2; }; - fetchDebianPatch = callPackages ../build-support/fetchdebianpatch/tests.nix { }; - fetchzip = callPackages ../build-support/fetchzip/tests.nix { }; - fetchgit = callPackages ../build-support/fetchgit/tests.nix { }; - fetchFirefoxAddon = callPackages ../build-support/fetchfirefoxaddon/tests.nix { }; - fetchPypiLegacy = callPackages ../build-support/fetchpypilegacy/tests.nix { }; + fetchurl = recurseIntoAttrs (callPackages ../build-support/fetchurl/tests.nix { }); + fetchtorrent = recurseIntoAttrs (callPackages ../build-support/fetchtorrent/tests.nix { }); + fetchpatch = recurseIntoAttrs (callPackages ../build-support/fetchpatch/tests.nix { }); + fetchpatch2 = recurseIntoAttrs ( + callPackages ../build-support/fetchpatch/tests.nix { fetchpatch = fetchpatch2; } + ); + fetchDebianPatch = recurseIntoAttrs (callPackages ../build-support/fetchdebianpatch/tests.nix { }); + fetchzip = recurseIntoAttrs (callPackages ../build-support/fetchzip/tests.nix { }); + fetchgit = recurseIntoAttrs (callPackages ../build-support/fetchgit/tests.nix { }); + fetchFirefoxAddon = recurseIntoAttrs ( + callPackages ../build-support/fetchfirefoxaddon/tests.nix { } + ); + fetchPypiLegacy = recurseIntoAttrs (callPackages ../build-support/fetchpypilegacy/tests.nix { }); - install-shell-files = callPackage ./install-shell-files { }; + install-shell-files = recurseIntoAttrs (callPackage ./install-shell-files { }); checkpointBuildTools = callPackage ./checkpointBuild { }; @@ -138,7 +142,7 @@ with pkgs; ld-library-path = callPackage ./ld-library-path { }; - cross = callPackage ./cross { }; + cross = recurseIntoAttrs (callPackage ./cross { }); php = recurseIntoAttrs (callPackages ./php { }); @@ -146,18 +150,18 @@ with pkgs; __recurseIntoDerivationForReleaseJobs = true; }; - buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { }; - importCargoLock = callPackage ../build-support/rust/test/import-cargo-lock { }; + buildRustCrate = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { }); + importCargoLock = recurseIntoAttrs (callPackage ../build-support/rust/test/import-cargo-lock { }); vim = callPackage ./vim { }; nixos-functions = callPackage ./nixos-functions { }; - nixosOptionsDoc = callPackage ../../nixos/lib/make-options-doc/tests.nix { }; + nixosOptionsDoc = recurseIntoAttrs (callPackage ../../nixos/lib/make-options-doc/tests.nix { }); overriding = callPackage ./overriding.nix { }; - texlive = callPackage ./texlive { }; + texlive = recurseIntoAttrs (callPackage ./texlive { }); cuda = callPackage ./cuda { }; @@ -175,7 +179,7 @@ with pkgs; dotnet = recurseIntoAttrs (callPackages ./dotnet { }); - makeHardcodeGsettingsPatch = callPackage ./make-hardcode-gsettings-patch { }; + makeHardcodeGsettingsPatch = recurseIntoAttrs (callPackage ./make-hardcode-gsettings-patch { }); makeWrapper = callPackage ./make-wrapper { }; makeBinaryWrapper = callPackage ./make-binary-wrapper { From 4c96cad82499474c0957a2cb21e5c098ed5a297e Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 13 May 2025 20:38:41 +0200 Subject: [PATCH 20/92] tests.cross.{gcc,llvm}.*: don't recurse into Makes the ci get killed by OOM --- pkgs/test/cross/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index c12682af08c1..8035abbc2902 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -71,7 +71,7 @@ let mapMultiPlatformTest = crossSystemFun: test: - lib.recurseIntoAttrs ( + lib.dontRecurseIntoAttrs ( lib.mapAttrs ( name: system: lib.recurseIntoAttrs (test rec { From ff62fe41360357452cd5232c7006661e4f512798 Mon Sep 17 00:00:00 2001 From: Matt Christ Date: Sun, 4 Aug 2024 13:23:34 -0500 Subject: [PATCH 21/92] brscan5: remove deprecated SYSFS udev rule This patch resolves an issue where systemd-udevd outputs events like: /nix/store/jm9paymkapbi6pzwbjgmi634vaf2y5va-udev-rules/49-brother-mfp-brscan5-1.0.2-2.rules:17 Invalid key 'SYSFS'. --- nixos/tests/brscan5.nix | 4 ++++ pkgs/by-name/br/brscan5/package.nix | 3 +++ 2 files changed, 7 insertions(+) diff --git a/nixos/tests/brscan5.nix b/nixos/tests/brscan5.nix index f61228bac41e..ba1916e27d26 100644 --- a/nixos/tests/brscan5.nix +++ b/nixos/tests/brscan5.nix @@ -48,6 +48,10 @@ import ./make-test-python.nix ( print(scanimage) assert """device `brother5:net1;dev0' is a Brother b ADS-1200""" in scanimage assert """device `brother5:net1;dev1' is a Brother a ADS-1200""" in scanimage + + # Confirm systemd-udevd no longer logs errors about SYSFS + logs = machine.succeed('journalctl --unit systemd-udevd') + assert "Invalid key 'SYSFS'" not in logs ''; } ) diff --git a/pkgs/by-name/br/brscan5/package.nix b/pkgs/by-name/br/brscan5/package.nix index 2a0490da9ed5..01a36caff2ab 100644 --- a/pkgs/by-name/br/brscan5/package.nix +++ b/pkgs/by-name/br/brscan5/package.nix @@ -79,6 +79,9 @@ stdenv.mkDerivation rec { # driver is hardcoded to look in /opt/brother/scanner/brscan5/models for model metadata. # patch it to look in /etc/opt/brother/scanner/models instead, so nixos environment.etc can make it available printf '/etc/opt/brother/scanner/models\x00' | dd of=opt/brother/scanner/brscan5/libsane-brother5.so.1.0.7 bs=1 seek=${toString patchOffsetBytes} conv=notrunc + + # remove deprecated SYSFS udev rule + sed -i -e '/^SYSFS/d' opt/brother/scanner/brscan5/udev-rules/*.rules ''; installPhase = '' From 7ad05bdb77ab3fd1c6eb1e22fc74c0a0ec8ecc12 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 16 May 2025 12:34:23 +0200 Subject: [PATCH 22/92] twitch-dl: 3.0.0 -> 3.1.0 Changelog: https://github.com/ihabunek/twitch-dl/blob/3.1.0/CHANGELOG.md --- pkgs/by-name/tw/twitch-dl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tw/twitch-dl/package.nix b/pkgs/by-name/tw/twitch-dl/package.nix index 5bbfb1baed72..c73f9924ff82 100644 --- a/pkgs/by-name/tw/twitch-dl/package.nix +++ b/pkgs/by-name/tw/twitch-dl/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "twitch-dl"; - version = "3.0.0"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "ihabunek"; repo = "twitch-dl"; tag = version; - hash = "sha256-/TlJG6Mh8/Ax4bKKR/plhMMY2x6YXwcFP6zjClOPaD8="; + hash = "sha256-Nn/Nwd1KvrkR+uGp8HmRGeBC7E0/Y1EVMpJAp7UDj7Q="; }; nativeBuildInputs = [ From 40d581fdb17291b9927b90c05ade42ea5896d717 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 5 May 2025 03:10:55 +0200 Subject: [PATCH 23/92] veryl: 0.15.0 -> 0.16.0 Diff: https://github.com/veryl-lang/veryl/compare/v0.15.0...v0.16.0 Changelog: https://github.com/veryl-lang/veryl/releases/tag/v0.16.0 --- pkgs/by-name/ve/veryl/package.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ve/veryl/package.nix b/pkgs/by-name/ve/veryl/package.nix index 8c3340b508a9..3efde5feca64 100644 --- a/pkgs/by-name/ve/veryl/package.nix +++ b/pkgs/by-name/ve/veryl/package.nix @@ -11,18 +11,18 @@ rustPlatform.buildRustPackage rec { pname = "veryl"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "veryl-lang"; repo = "veryl"; rev = "v${version}"; - hash = "sha256-PeRz44agIKDPsgUhjPgm1Pn1oJb7Epyw0oj3xPCkj4k="; + hash = "sha256-KlW5GC5fgUnS6YAb01VEaKv48+yu8VqgAe/5QsilYjs="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-PD1S9h4cGGgfRBB0iZzY7GRTeclRhwWLrxvNVEs8OJY="; + cargoHash = "sha256-HKDkV2eDjhfuky2ORdKwbyBa/kt1gEqK55AibKg5VYE="; nativeBuildInputs = [ pkg-config @@ -68,6 +68,14 @@ rustPlatform.buildRustPackage rec { "--skip=path::directory_target" "--skip=path::source_directory" "--skip=path::source_target" + "--skip=path::rootdir_directory_directory" + "--skip=path::rootdir_directory_target" + "--skip=path::rootdir_source_directory" + "--skip=path::rootdir_source_target" + "--skip=path::subdir_directory_directory" + "--skip=path::subdir_directory_target" + "--skip=path::subdir_source_directory" + "--skip=path::subdir_source_target" ]; meta = { From b3bdbf48063b7971a9a90ec77669b9cbd13a28e3 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Fri, 16 May 2025 15:37:55 +0200 Subject: [PATCH 24/92] udevCheckHook: init Usage: ```nix nativeBuildInputs = [ udevCheckHook ]; doInstallCheck = true; ``` This hook executes `udevadm verify --resolve-names=never --no-style` on all outputs that have `/etc/udev/rules.d`. This us a logical part of #404323 to check packages that supply udev rules. Note this hook introduces a dependency on `systemdMinimal`, meaning this can't check systemdMinimal or its dependencies. --- pkgs/by-name/ud/udevCheckHook/hook.sh | 27 +++++++++++++++++++++++ pkgs/by-name/ud/udevCheckHook/package.nix | 16 ++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/by-name/ud/udevCheckHook/hook.sh create mode 100644 pkgs/by-name/ud/udevCheckHook/package.nix diff --git a/pkgs/by-name/ud/udevCheckHook/hook.sh b/pkgs/by-name/ud/udevCheckHook/hook.sh new file mode 100644 index 000000000000..507e0292b8c8 --- /dev/null +++ b/pkgs/by-name/ud/udevCheckHook/hook.sh @@ -0,0 +1,27 @@ +# shellcheck shell=bash + +udevCheckHook() { + runHook preUdevCheck + echo Executing udevCheckPhase + + # as per nixos/modules/services/hardware/udev.nix: + # - both /lib and /etc is valid paths for udev rules + # - udev rules are expected to be part of the $bin output + # However, not all udev rules are actually in $bin (some are in $lib or $out). + # This means we have to actually check all outputs here. + for output in $(getAllOutputNames); do + for path in etc lib ; do + if [ -d "${!output}/$path/udev/rules.d" ]; then + @udevadm@ verify --resolve-names=never --no-style "${!output}/$path/udev/rules.d" + fi + done + done + + runHook postUdevCheck + echo Finished udevCheckPhase +} + +if [[ -z "${dontUdevCheck-}" ]]; then + echo "Using udevCheckHook" + preInstallCheckHooks+=(udevCheckHook) +fi diff --git a/pkgs/by-name/ud/udevCheckHook/package.nix b/pkgs/by-name/ud/udevCheckHook/package.nix new file mode 100644 index 000000000000..61a82530cdd3 --- /dev/null +++ b/pkgs/by-name/ud/udevCheckHook/package.nix @@ -0,0 +1,16 @@ +{ + lib, + makeSetupHook, + systemdMinimal, +}: + +makeSetupHook { + name = "udev-check-hook"; + substitutions = { + udevadm = lib.getExe' systemdMinimal "udevadm"; + }; + meta = { + description = "check validity of udev rules in outputs"; + maintainers = with lib.maintainers; [ grimmauld ]; + }; +} ./hook.sh From f63ba2b0b633b8f928054887544304fb630ad5d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 00:52:19 +0000 Subject: [PATCH 25/92] cotp: 1.9.4 -> 1.9.5 --- pkgs/by-name/co/cotp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/cotp/package.nix b/pkgs/by-name/co/cotp/package.nix index 6b41c6d5496f..f4425425c19f 100644 --- a/pkgs/by-name/co/cotp/package.nix +++ b/pkgs/by-name/co/cotp/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "cotp"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "replydev"; repo = "cotp"; rev = "v${version}"; - hash = "sha256-O9qss8vxsGyBWaCTt3trjnFVol5ib/G7IZIj742A/XI="; + hash = "sha256-Jv5BT7P/OXLkkfrEf+8x2IrACMhqr3zpbcKX8I/TzDc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Y8kGOeDKjdG+5zuA1mDx4h5IbKETjZU+SiFWiUv3xkw="; + cargoHash = "sha256-9iZyi3TPnqRpt+SRI3t7kwwiGpwUjQ0BrLZQY3X383o="; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]; From 7ff2f337952632e9a6cea1cf0a363221f1d2a6e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 01:13:36 +0000 Subject: [PATCH 26/92] git-who: 0.7 -> 1.0 --- pkgs/by-name/gi/git-who/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/git-who/package.nix b/pkgs/by-name/gi/git-who/package.nix index bc646ec29ff6..2d56258c1bc6 100644 --- a/pkgs/by-name/gi/git-who/package.nix +++ b/pkgs/by-name/gi/git-who/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "git-who"; - version = "0.7"; + version = "1.0"; src = fetchFromGitHub { owner = "sinclairtarget"; repo = "git-who"; rev = "v${version}"; - hash = "sha256-64Hb2+ZCXJis19V0WDyZ0SHZX99Dqxr3UGQTQZSCAp8="; + hash = "sha256-xJHFPf3w+6jh6vPTg4ggq652lANZkBBkKsmkvWx48ZU="; }; vendorHash = "sha256-e2P7szjtAn4EFTy+eGi/9cYf/Raw/7O+PbYEOD8i3Hs="; From cc08b3d8e56c2ad35add3681866507b748f509d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 01:14:49 +0000 Subject: [PATCH 27/92] hadolint-sarif: 0.7.0 -> 0.8.0 --- pkgs/by-name/ha/hadolint-sarif/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/hadolint-sarif/package.nix b/pkgs/by-name/ha/hadolint-sarif/package.nix index 02baea0f720c..3ec435ccb785 100644 --- a/pkgs/by-name/ha/hadolint-sarif/package.nix +++ b/pkgs/by-name/ha/hadolint-sarif/package.nix @@ -7,15 +7,15 @@ }: rustPlatform.buildRustPackage rec { pname = "hadolint-sarif"; - version = "0.7.0"; + version = "0.8.0"; src = fetchCrate { inherit pname version; - hash = "sha256-HPGVqAk1bXzeblTc4AnCLsHB60CKFV8ImO+MFqM10YI="; + hash = "sha256-7xvo194lCQpDtLgwX6rZEkwG3hYTp5czjw4GrEaivsI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-1nl5Myr8o1gyvkpsdMVLjZqnLkULOmxUOT0NmVe+0Oo="; + cargoHash = "sha256-R4fGlo65/suNozEzRaQ3k6Ys4CMBheT2+rHZZZuIstM="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; From cf06bb3bd3febc894ca2bfe4716f43afa0e1979f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 03:07:03 +0000 Subject: [PATCH 28/92] python3Packages.commitizen: 4.7.0 -> 4.7.1 --- pkgs/development/python-modules/commitizen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix index 57831c87e135..af0c9fee6d10 100644 --- a/pkgs/development/python-modules/commitizen/default.nix +++ b/pkgs/development/python-modules/commitizen/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "commitizen"; - version = "4.7.0"; + version = "4.7.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "commitizen-tools"; repo = "commitizen"; tag = "v${version}"; - hash = "sha256-fCQtSzOUezd3UE8bktn2cw4qwnl2pM6L7bBgKKFq5AM="; + hash = "sha256-SSj9K1ujwi/KNzugB0mIo0VMOz3WbCQ6X07ztB0JJsU="; }; pythonRelaxDeps = [ From 5da24a5050c71e76dc8c26f03187ee975faa1bd0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 04:44:40 +0000 Subject: [PATCH 29/92] python3Packages.django-admin-sortable2: 2.2.6 -> 2.2.8 --- .../python-modules/django-admin-sortable2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-admin-sortable2/default.nix b/pkgs/development/python-modules/django-admin-sortable2/default.nix index 3687449e4b8e..001f807f1c09 100644 --- a/pkgs/development/python-modules/django-admin-sortable2/default.nix +++ b/pkgs/development/python-modules/django-admin-sortable2/default.nix @@ -9,13 +9,13 @@ }: let pname = "django-admin-sortable2"; - version = "2.2.6"; + version = "2.2.8"; src = fetchFromGitHub { owner = "jrief"; repo = "django-admin-sortable2"; tag = version; - hash = "sha256-MIxZ33Q8dHo102zvQqMiOlxtPjkenQQYTRyXJOHdCqE="; + hash = "sha256-T5dppM/o305GCg5uU7re/FdjhXFUyiH/DO2JTVf6Xgg="; }; assets = buildNpmPackage { @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = { description = "Generic drag-and-drop ordering for objects in the Django admin interface"; homepage = "https://github.com/jrief/django-admin-sortable2"; - changelog = "https://github.com/jrief/django-admin-sortable2/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/jrief/django-admin-sortable2/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sephi ]; }; From 73f36cc9d2109f50403eeee5231ab111cd302fea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 05:20:50 +0000 Subject: [PATCH 30/92] bento: 1.6.1 -> 1.7.1 --- pkgs/by-name/be/bento/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix index 8ee8cccd97c3..badc035b76cc 100644 --- a/pkgs/by-name/be/bento/package.nix +++ b/pkgs/by-name/be/bento/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "bento"; - version = "1.6.1"; + version = "1.7.1"; src = fetchFromGitHub { owner = "warpstreamlabs"; repo = "bento"; tag = "v${version}"; - hash = "sha256-T13r41ygQNmEBCwTKyCocQbGcyJSQ8lvmRllbxU512Y="; + hash = "sha256-pV7Fd+Ir+ZqteM0In/NiZrAyvPFS+oOnONhGVeBzA2g="; }; proxyVendor = true; - vendorHash = "sha256-/DXdPL98Y4peF3USV9/J4sT/TUTRp3Cds500kxb18QA="; + vendorHash = "sha256-ow/XOO8Xc72v6Ue9VHjnPuq+HlqE4YZHw+gJB4x7sKk="; subPackages = [ "cmd/bento" From 5c8040e4431c65629e00948b99444fe51b2176f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 05:24:33 +0000 Subject: [PATCH 31/92] python3Packages.fastbencode: 0.3.1 -> 0.3.2 --- pkgs/development/python-modules/fastbencode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix index 195491ec8ab6..358cf7136128 100644 --- a/pkgs/development/python-modules/fastbencode/default.nix +++ b/pkgs/development/python-modules/fastbencode/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "fastbencode"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-X+DLfRc2iRr2HSreQM6UiUHUbpCLFvU4P1XxJ4SNoZc="; + hash = "sha256-o0wyxQSw7J3hpJk0btJJMjWetGI0sotwl1pQ/fqhSrU="; }; build-system = [ setuptools ]; From d4a29cfde5c1aff546ad84e84c1fbcc280499ab8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 05:37:14 +0000 Subject: [PATCH 32/92] sarif-fmt: 0.7.0 -> 0.8.0 --- pkgs/by-name/sa/sarif-fmt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sa/sarif-fmt/package.nix b/pkgs/by-name/sa/sarif-fmt/package.nix index 121762365651..cba1bff8a1ef 100644 --- a/pkgs/by-name/sa/sarif-fmt/package.nix +++ b/pkgs/by-name/sa/sarif-fmt/package.nix @@ -8,15 +8,15 @@ }: rustPlatform.buildRustPackage rec { pname = "sarif-fmt"; - version = "0.7.0"; + version = "0.8.0"; src = fetchCrate { inherit pname version; - hash = "sha256-uQQ/UbmyPJbilxP2R+6KyBkf2dzGohN22xCCtU31y0s="; + hash = "sha256-Xc9uc//5wTBWJ89mcaC/4c8/xtTvnu8g2Aa1viUhluo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-naABVC4z5tYfe/Y2Gw4wp2Ye9wIF0Wq7jqhelcRQY30="; + cargoHash = "sha256-h4g4+2yiqr3CTkSgv8fTHEVQwSunFfYFhIczSGA+M5U="; # `test_clippy` (the only test we enable) is broken on Darwin # because `--enable-profiler` is not enabled in rustc on Darwin From 79f7326693c3db9230273e5a7b8b0623226fbff4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 05:59:03 +0000 Subject: [PATCH 33/92] heimdall-proxy: 0.16.1 -> 0.16.2 --- pkgs/by-name/he/heimdall-proxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/he/heimdall-proxy/package.nix b/pkgs/by-name/he/heimdall-proxy/package.nix index 4f5f01e4d3d3..11f0e6664d7f 100644 --- a/pkgs/by-name/he/heimdall-proxy/package.nix +++ b/pkgs/by-name/he/heimdall-proxy/package.nix @@ -4,7 +4,7 @@ lib, }: let - version = "0.16.1"; + version = "0.16.2"; in buildGoModule { pname = "heimdall-proxy"; @@ -15,10 +15,10 @@ buildGoModule { owner = "dadrus"; repo = "heimdall"; tag = "v${version}"; - hash = "sha256-HP2YuipqqToTD44FreKtdJErtF4CWxnMf2JRmjgLuv0="; + hash = "sha256-RzRjcg9GocqXpBh8C34LrSLbSrJWd9y4+YEWJaAD8d0="; }; - vendorHash = "sha256-9AOUgQEhOUzzT+qJLE7NlPqiQDQHJnLOT9JSwpetQXA="; + vendorHash = "sha256-GVUO5a6m85C7JRJ9WBTB7JDHRaiU2Nq3clWQUedKp98="; tags = [ "sqlite" ]; From 80cab842c4bd1eef1cf2273fa9a66ba57aa44db1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 May 2025 09:06:34 +0200 Subject: [PATCH 34/92] python3Packages.fastbencode: update disabled --- pkgs/development/python-modules/fastbencode/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix index 358cf7136128..ab515a234fa1 100644 --- a/pkgs/development/python-modules/fastbencode/default.nix +++ b/pkgs/development/python-modules/fastbencode/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { version = "0.3.2"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; From 1f899da194ffb5f17bdde58256da2d51452b24b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 07:23:55 +0000 Subject: [PATCH 35/92] ergochat: 2.15.0 -> 2.16.0 --- pkgs/by-name/er/ergochat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/er/ergochat/package.nix b/pkgs/by-name/er/ergochat/package.nix index 3a0de73fdf32..67910c2e3272 100644 --- a/pkgs/by-name/er/ergochat/package.nix +++ b/pkgs/by-name/er/ergochat/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ergo"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "ergochat"; repo = "ergo"; rev = "v${version}"; - sha256 = "sha256-8qZ5pnbCYN/j8B5cS456HVK2hDGqJwrPo1k4oagJrqU="; + sha256 = "sha256-AUXuH7YjC/yG5Ocs+kAOF8bAR4UVgfx96VDSHEqmqgg="; }; vendorHash = null; From 8dcd0339f01722510a57f8d1d6374437669ae4b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 08:45:50 +0000 Subject: [PATCH 36/92] nwg-drawer: 0.6.5 -> 0.7.0 --- pkgs/by-name/nw/nwg-drawer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix index 684d337fc7a3..f38232fbec1a 100644 --- a/pkgs/by-name/nw/nwg-drawer/package.nix +++ b/pkgs/by-name/nw/nwg-drawer/package.nix @@ -13,16 +13,16 @@ let pname = "nwg-drawer"; - version = "0.6.5"; + version = "0.7.0"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-drawer"; rev = "v${version}"; - hash = "sha256-fWh2htmLIM0IHRYOs8fzrjwq1IRLDJpWniY24BVFtFE="; + hash = "sha256-M0+4/lr79CYBy2+ysB1Wb1obD7B/Qi8MBwNhIsiIDak="; }; - vendorHash = "sha256-iUFOWPr306CteR+5Cz/kE+XoG/qr3BBdM9duZm4TOU4="; + vendorHash = "sha256-1uZTZ7/p1l4Rue3mxlaMRSDfyARo94wR4KIKkQXBUMQ="; in buildGoModule { inherit From 556eca1e184a84e294b6cb27c8daf4eb72ba8fc4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 08:57:51 +0000 Subject: [PATCH 37/92] shellcheck-sarif: 0.7.0 -> 0.8.0 --- pkgs/by-name/sh/shellcheck-sarif/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sh/shellcheck-sarif/package.nix b/pkgs/by-name/sh/shellcheck-sarif/package.nix index dd0bed1f3e70..05c8017faf34 100644 --- a/pkgs/by-name/sh/shellcheck-sarif/package.nix +++ b/pkgs/by-name/sh/shellcheck-sarif/package.nix @@ -7,15 +7,15 @@ }: rustPlatform.buildRustPackage rec { pname = "shellcheck-sarif"; - version = "0.7.0"; + version = "0.8.0"; src = fetchCrate { inherit pname version; - hash = "sha256-cgcvl/nlnJtYzTfxbJHJ967zFH8KtWTMZPKGVpH66z0="; + hash = "sha256-G69DiDl78vkPuLodsRTL7dbbIFtNNF/XWuLZpCHKJws="; }; useFetchCargoVendor = true; - cargoHash = "sha256-eJzhaLQCniVUmsFgvzLE9Aw1nUq+P9m9wjSH3l8vQxo="; + cargoHash = "sha256-ZA7l7fmQG1wjT8oLVp6w2okPlwfNGQw/7qrH3rRS+0o="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; From 03d7e5e4b1f35d903d70dc83ac70c9073059c42d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 11:33:40 +0000 Subject: [PATCH 38/92] nu_scripts: 0-unstable-2025-05-05 -> 0-unstable-2025-05-15 --- pkgs/by-name/nu/nu_scripts/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix index 18faafa763c6..8130882db143 100644 --- a/pkgs/by-name/nu/nu_scripts/package.nix +++ b/pkgs/by-name/nu/nu_scripts/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "nu_scripts"; - version = "0-unstable-2025-05-05"; + version = "0-unstable-2025-05-15"; src = fetchFromGitHub { owner = "nushell"; repo = "nu_scripts"; - rev = "4ecbb0e04e0a944145c86ec8bf3e4fc7ca3958a5"; - hash = "sha256-ssqSZnc8YnCB/62eN9KQzf+cm686/NFKcj4M2sd0XxM="; + rev = "b2d512f6c67f68895a26136c6ce552281efbec6e"; + hash = "sha256-iC5Qmyn9vDr4b1BWtJkC3pl2dOam2Se51+ENvRdXlvA="; }; installPhase = '' From 0912a536623a3efadfa6d7a6408cceb9f0f4ba77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 11:57:25 +0000 Subject: [PATCH 39/92] python3Packages.hyperscan: 0.7.9 -> 0.7.13 --- pkgs/development/python-modules/hyperscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hyperscan/default.nix b/pkgs/development/python-modules/hyperscan/default.nix index b2b16464db70..29b3435df72e 100644 --- a/pkgs/development/python-modules/hyperscan/default.nix +++ b/pkgs/development/python-modules/hyperscan/default.nix @@ -23,14 +23,14 @@ let in buildPythonPackage rec { pname = "hyperscan"; - version = "0.7.9"; + version = "0.7.13"; pyproject = true; src = fetchFromGitHub { owner = "darvid"; repo = "python-hyperscan"; tag = "v${version}"; - hash = "sha256-tf3dQgY0p+J6GIS8pB3+kvomNVYcbMJ+72T8IVbrnrU="; + hash = "sha256-l97UXuM37WK3XRSoIfQzobkM+3WYp6JUtemn/28mMNk="; }; env.CMAKE_ARGS = "-DHS_SRC_ROOT=${pkgs.hyperscan.src} -DHS_BUILD_LIB_ROOT=${lib-deps}/lib"; From ae1e5f6f2d209ece31c9fcfa6aa92407534a87e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 12:02:40 +0000 Subject: [PATCH 40/92] auth0-cli: 1.12.0 -> 1.13.0 --- pkgs/by-name/au/auth0-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix index 464ad61458a5..999362ef86b6 100644 --- a/pkgs/by-name/au/auth0-cli/package.nix +++ b/pkgs/by-name/au/auth0-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "auth0-cli"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "auth0"; repo = "auth0-cli"; tag = "v${version}"; - hash = "sha256-T3AJYDPdVkFYsvZUIdqndaxsJmsoJeeyr0316rafg7Q="; + hash = "sha256-RcRJBW8FgCi9Lxz/KARql7ArozqYgttpQ9IXIKzvo6s="; }; - vendorHash = "sha256-/F3GNGCfsa9LM1F+eYJ+okqqjIuKfxHDT90ZS9gsJzs="; + vendorHash = "sha256-6y2iGxaromnMYIU2rnvwmQwn8f1PdihB4DH9r5sRT68="; ldflags = [ "-s" From a0964927c914e1fe37c6e35250349911c9102c0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 13:23:59 +0000 Subject: [PATCH 41/92] obs-studio-plugins.obs-vkcapture: 1.5.1 -> 1.5.2 --- pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index 141bf70c2a2d..f01050fffa25 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "obs-vkcapture"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "nowrep"; repo = "obs-vkcapture"; rev = "v${finalAttrs.version}"; - hash = "sha256-RIDsT6eL6bUfqPiyPlecnZHu5OorcJb3Xal8pjdOpAA="; + hash = "sha256-ghfRST7J3bipQnOZnYMtmDggET+Etq/ngHs+zQ0bm1w="; }; cmakeFlags = lib.optionals stdenv.hostPlatform.isi686 [ From 6a013d516d6a19418c3e95677fc79f8ce86d8d01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 14:23:57 +0000 Subject: [PATCH 42/92] bamtools: 2.5.2 -> 2.5.3 --- pkgs/by-name/ba/bamtools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/bamtools/package.nix b/pkgs/by-name/ba/bamtools/package.nix index 2c6792c47c88..e522610b1df9 100644 --- a/pkgs/by-name/ba/bamtools/package.nix +++ b/pkgs/by-name/ba/bamtools/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bamtools"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "pezmaster31"; repo = "bamtools"; tag = "v${finalAttrs.version}"; - hash = "sha256-l2DmA4P1kPneTCL9YVACE6LcQHT0F+mufPyM69VkksE="; + hash = "sha256-3kIa407YgBpulh2koQQFK/RLmGEZvEvTnZyWKm+pngg="; }; nativeBuildInputs = [ From e3019707ce3e5462be3016556a477e536868bb0a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 14:33:13 +0000 Subject: [PATCH 43/92] aliyun-cli: 3.0.273 -> 3.0.277 --- pkgs/by-name/al/aliyun-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix index 00a70aa58ae5..70bc20f74d59 100644 --- a/pkgs/by-name/al/aliyun-cli/package.nix +++ b/pkgs/by-name/al/aliyun-cli/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.273"; + version = "3.0.277"; src = fetchFromGitHub { owner = "aliyun"; repo = "aliyun-cli"; tag = "v${version}"; - hash = "sha256-Zmi+izG8gHZrtSaLR9sE9F0W55+PEj25lBKueIwY8iY="; + hash = "sha256-4HWSebmMys3yzj2H3JC7hAayl9xQeVBQWCEGlZSudUc="; fetchSubmodules = true; }; - vendorHash = "sha256-K6et/P1GKoZeEsfB5LMBqfBx+YoVMMC87YLNKOkL30g="; + vendorHash = "sha256-cyE7yuwYUR/vv1w/b7QaiSoyX2XiUy5vNdodu+9PIl8="; subPackages = [ "main" ]; From fcf4ffd4cb15677e748fdf5902d58209a5ea356a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 14:57:43 +0000 Subject: [PATCH 44/92] kubevpn: 2.7.5 -> 2.7.11 --- pkgs/by-name/ku/kubevpn/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ku/kubevpn/package.nix b/pkgs/by-name/ku/kubevpn/package.nix index 3a24c32e271a..119d07ba0354 100644 --- a/pkgs/by-name/ku/kubevpn/package.nix +++ b/pkgs/by-name/ku/kubevpn/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "kubevpn"; - version = "2.7.5"; + version = "2.7.11"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - hash = "sha256-WB3Qths9Lg48KfmRYg6O+fZIQ97n+Q7LgudT4Npqnl8="; + hash = "sha256-PqKgBJugibgG/4gGBINuFxWAxSYEKRpPXpofiOKmmIs="; }; vendorHash = null; From 01afe9297fc7fbd1fcfb0b7758b6f83a9f183051 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 15:29:38 +0000 Subject: [PATCH 45/92] usacloud: 1.14.1 -> 1.15.0 --- pkgs/by-name/us/usacloud/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/us/usacloud/package.nix b/pkgs/by-name/us/usacloud/package.nix index 3be97db466c0..2badd8c0e9af 100644 --- a/pkgs/by-name/us/usacloud/package.nix +++ b/pkgs/by-name/us/usacloud/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "usacloud"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "sacloud"; repo = "usacloud"; tag = "v${version}"; - hash = "sha256-bIVC0pa+54a/OpGKOM3LH7IMZnuYDvfGOMxcIwhHI7U="; + hash = "sha256-HrcUoRqjbP6E/C9PfFYw73XaA5ysNLYqsiifXVnlhe0="; }; - vendorHash = "sha256-m89iw5nk34KkCh8vlnKcwoPQXprUKzETYQNzi2CtX4c="; + vendorHash = "sha256-OIS0QV0t4Y06/B8L48IlftWjzahptaa0PAcxEcRdDPo="; ldflags = [ "-s" From d17aba125e3a3d8bb04dddc08339ab1592e6a044 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 16:59:46 +0000 Subject: [PATCH 46/92] sing-box: 1.11.10 -> 1.11.11 --- pkgs/by-name/si/sing-box/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix index b984eb613229..e708f141f705 100644 --- a/pkgs/by-name/si/sing-box/package.nix +++ b/pkgs/by-name/si/sing-box/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.11.10"; + version = "1.11.11"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-GcoAxfFH/eP97E7tN//LbNCSbEASfzDL5OYHyL54eh8="; + hash = "sha256-hdYYjKBXnTqScYTUCfMmXozDD8GtIorLXnsU2Fmwg/c="; }; - vendorHash = "sha256-7VfAFkdI4XFkMp2GJIzPFSXyUWNwT3o+EN5gI8U/wIQ="; + vendorHash = "sha256-/0pwsZbMbyAFXCrukbNf2RmQjQJ1E/ZUwzrC+5NEZcc="; tags = [ "with_quic" From 6f2e7ccfcedb24952e150a766475812c45500284 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 19:43:49 +0000 Subject: [PATCH 47/92] python3Packages.gspread: 6.2.0 -> 6.2.1 --- pkgs/development/python-modules/gspread/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 5923ce6ad2a4..201460b18868 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "gspread"; - version = "6.2.0"; + version = "6.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "burnash"; repo = "gspread"; tag = "v${version}"; - hash = "sha256-DTKSH8FtzOXlB7TzNqahDm8PY3ZarpZg8GYQ1kcdfdg="; + hash = "sha256-j7UNti5N8c1mjw+1qTPIRCWJ6M4Ur0P9sG1uJnp170M="; }; nativeBuildInputs = [ flit-core ]; From 48519415ce26595fcb84041628050089f5a45a93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 20:24:33 +0000 Subject: [PATCH 48/92] cpm-cmake: 0.41.0 -> 0.42.0 --- pkgs/by-name/cp/cpm-cmake/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cp/cpm-cmake/package.nix b/pkgs/by-name/cp/cpm-cmake/package.nix index 88ac9bf9c9b9..8fac7bd37c96 100644 --- a/pkgs/by-name/cp/cpm-cmake/package.nix +++ b/pkgs/by-name/cp/cpm-cmake/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cpm-cmake"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "cpm-cmake"; repo = "cpm.cmake"; rev = "v${finalAttrs.version}"; - hash = "sha256-sQHDZD2/BBlBXlPeY094dNkJNw+CF00FBvezYA5zxXg="; + hash = "sha256-IA13qA/b+owlrqbVAkhd4rS98/XB5RNONiJaPwjDm+A="; }; postPatch = '' From 33f4db9e6bb6a2b9216f65ed5c3ee00f20088299 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 20:54:32 +0000 Subject: [PATCH 49/92] circleci-cli: 0.1.31632 -> 0.1.31792 --- pkgs/by-name/ci/circleci-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/circleci-cli/package.nix b/pkgs/by-name/ci/circleci-cli/package.nix index 8b2422116c55..763b862a5732 100644 --- a/pkgs/by-name/ci/circleci-cli/package.nix +++ b/pkgs/by-name/ci/circleci-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.31632"; + version = "0.1.31792"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3ufazu7DuUFp3aBxQ5MPlndECHSjvEIscYjlvE3j9G8="; + sha256 = "sha256-0D0jCBE027zEQI/3iX4nF5ut8PS+nKuKhNf5+buazb8="; }; vendorHash = "sha256-H7q373HL6M6ETkXEY5tAwN32rx0eMkqRAAZ4kQf9rKk="; From ec608a6224aedd9f8f4a216db8bd4e30815ec703 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 20:57:28 +0000 Subject: [PATCH 50/92] cnquery: 11.53.2 -> 11.54.0 --- pkgs/by-name/cn/cnquery/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix index de71fc682b16..b31597fcbee4 100644 --- a/pkgs/by-name/cn/cnquery/package.nix +++ b/pkgs/by-name/cn/cnquery/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "11.53.2"; + version = "11.54.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; tag = "v${version}"; - hash = "sha256-nqzlwBGsqGFh6yeqEWXE6MJyyiHwFh8ehaJjDbl+yd0="; + hash = "sha256-w9O3uEgzSe7e6+ij3AGVOVmDemDY8D1I4UcGXKb1B3E="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-CNbpMNT9OX7lAbLugS4vUcOHhtqEQcYFYaTe+HjewdA="; + vendorHash = "sha256-iGWdx4bgc4TFZ6opc/W9FfXkn6Xgff8pQjOl5SczgSE="; ldflags = [ "-w" From c1d1a9dc273b62c9906d5d5b5165bad32e6f0aee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 21:12:00 +0000 Subject: [PATCH 51/92] matrix-synapse-plugins.synapse-http-antispam: 0.3.0 -> 0.4.0 --- .../plugins/synapse-http-antispam.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/synapse-http-antispam.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/synapse-http-antispam.nix index f09938a98ec7..35cc6fcf54a3 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/synapse-http-antispam.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/synapse-http-antispam.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "synapse-http-antispam"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "maunium"; repo = "synapse-http-antispam"; tag = "v${version}"; - hash = "sha256-wWm23+3o+/nx3xGkyShJm28mDPTbOhPbKgW3WfuB0Ng="; + hash = "sha256-YvgHIZ5Kr9WsX30QN8W5OJ4sxLB7EsLqUmCye3x+JQA="; }; build-system = [ hatchling ]; From 0d060710c14275704ab48c6ed1ab68236a47184f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 21:32:08 +0000 Subject: [PATCH 52/92] python3Packages.sectxt: 0.9.6 -> 0.9.7 --- pkgs/development/python-modules/sectxt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sectxt/default.nix b/pkgs/development/python-modules/sectxt/default.nix index 186ffe143690..32c41fd0d026 100644 --- a/pkgs/development/python-modules/sectxt/default.nix +++ b/pkgs/development/python-modules/sectxt/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "sectxt"; - version = "0.9.6"; + version = "0.9.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "DigitalTrustCenter"; repo = "sectxt"; tag = version; - hash = "sha256-49YxhcOpi1wofKMRuNxt8esBtfaSoBrGu+yBCRFWZYY="; + hash = "sha256-CDVfT3ANb4ugLEvrSRTbkZMvZA6rcEwBu2c3pnjsza8="; }; build-system = [ setuptools ]; From aa4a522201f6b177c242cf4ec96026b4d9006175 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 22:09:55 +0000 Subject: [PATCH 53/92] goverter: 1.8.2 -> 1.8.3 --- pkgs/by-name/go/goverter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/goverter/package.nix b/pkgs/by-name/go/goverter/package.nix index c21915756642..b7d1525f800c 100644 --- a/pkgs/by-name/go/goverter/package.nix +++ b/pkgs/by-name/go/goverter/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "goverter"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "jmattheis"; repo = "goverter"; tag = "v${version}"; - hash = "sha256-f+rTEbr4Cr5PjXZg+E2235opxbakoYkJqEGRtyWrngE="; + hash = "sha256-ytW52raI4MV6cX/ThR6p9hohtngwBYuvSrtOfjnqwXc="; }; vendorHash = "sha256-YOtcidMhtQqw/KxY1R3L3XnrhayGQBvHkRdbvYyCQFM="; From 4a70e9546ee0899a26d62f7c8f18592efa3c9037 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 22:47:48 +0000 Subject: [PATCH 54/92] dependabot-cli: 1.63.0 -> 1.64.0 --- pkgs/by-name/de/dependabot-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix index 240b096997e7..a2ec545a7e32 100644 --- a/pkgs/by-name/de/dependabot-cli/package.nix +++ b/pkgs/by-name/de/dependabot-cli/package.nix @@ -11,7 +11,7 @@ }: let pname = "dependabot-cli"; - version = "1.63.0"; + version = "1.64.0"; # vv Also update this vv tag = "nixpkgs-dependabot-cli-${version}"; @@ -47,7 +47,7 @@ buildGoModule { owner = "dependabot"; repo = "cli"; rev = "v${version}"; - hash = "sha256-lk0AEFQYemr4wP7JXx5mPzzo2VzSJvygPP5vtUvPaxs="; + hash = "sha256-NcmDYCXdhMY1KFz3if0XlX4EisQFr0YhJItllXnOfaA="; }; vendorHash = "sha256-pnB1SkuEGm0KfkDfjnoff5fZRsAgD5w2H4UwsD3Jlbo="; From 242387e5def5b334958804b1b9114a2ac0674f7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 23:12:12 +0000 Subject: [PATCH 55/92] intentrace: 0.9.7 -> 0.9.8 --- pkgs/by-name/in/intentrace/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/intentrace/package.nix b/pkgs/by-name/in/intentrace/package.nix index 7584a1f59456..1059839fe172 100644 --- a/pkgs/by-name/in/intentrace/package.nix +++ b/pkgs/by-name/in/intentrace/package.nix @@ -5,7 +5,7 @@ }: let - version = "0.9.7"; + version = "0.9.8"; in rustPlatform.buildRustPackage { inherit version; @@ -15,11 +15,11 @@ rustPlatform.buildRustPackage { owner = "sectordistrict"; repo = "intentrace"; tag = "v${version}"; - hash = "sha256-24w5EQ3LQ7OxuVaqoLlUrYi2TmSLAfWGLNrkPcxMQMM="; + hash = "sha256-5QARHw9Z4+wYrxaAuSt9WjGR6qvSWAFIMdNOzE6FqfU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-pLGWXwpgTh/7SaDhs63jr+5Fpsiep1tfl9VlCEBrK1s="; + cargoHash = "sha256-m4kLpJeqAvDI8/1gjqRVkbOvyfcLfwi0y2iavvm25jw="; meta = { description = "Prettified Linux syscall tracing tool (like strace)"; From f8b64359d97073fe84ea8bd5391954861f4055a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 02:02:00 +0000 Subject: [PATCH 56/92] sqldef: 1.0.6 -> 1.0.7 --- pkgs/by-name/sq/sqldef/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sq/sqldef/package.nix b/pkgs/by-name/sq/sqldef/package.nix index be534ee31cd1..d9a1cd4eda76 100644 --- a/pkgs/by-name/sq/sqldef/package.nix +++ b/pkgs/by-name/sq/sqldef/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "sqldef"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "sqldef"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-tCKJ0iX0cWWdw+RSH15KTVDEcrZhbfZg+dgt/swDSJE="; + hash = "sha256-FDJeRIrx2LS6TQAlm9Kj13O4fccnRG6mYcLwTrOGrOI="; }; proxyVendor = true; - vendorHash = "sha256-1LpDM4XYV2k7d8vFx97AuZSVpClTvNU5ezXnbhOkkP0="; + vendorHash = "sha256-SkYRt/w8/YC6LGoADVRdyYdQw/Lves1rd4tl8lYNSSs="; ldflags = [ "-s" From 36e296cb2787950a0c4e92720055411b6e20f61f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 02:24:13 +0000 Subject: [PATCH 57/92] wait4x: 3.3.0 -> 3.3.1 --- pkgs/by-name/wa/wait4x/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wait4x/package.nix b/pkgs/by-name/wa/wait4x/package.nix index c6f43568472c..45a720138c15 100644 --- a/pkgs/by-name/wa/wait4x/package.nix +++ b/pkgs/by-name/wa/wait4x/package.nix @@ -5,7 +5,7 @@ }: let pname = "wait4x"; - version = "3.3.0"; + version = "3.3.1"; in buildGoModule { inherit pname version; @@ -14,10 +14,10 @@ buildGoModule { owner = "wait4x"; repo = pname; rev = "v${version}"; - hash = "sha256-QmuBoUHOZf6VKrh00BXFxT2e+gJL1gyv9BnhGaWVAD0="; + hash = "sha256-3s+ug4KqFv1P55eqNfAB2jbSPVzySxlHmkDMuuVlJcQ="; }; - vendorHash = "sha256-EqJDw88BqKfIUE/YoDNoI249covv5bzEcx9ykfUkik8="; + vendorHash = "sha256-dN7R2d7roA6H9wIz2sBaWctD8K6M8nbQbwPc3t/7rlk="; # Tests make network access doCheck = false; From 641789dbc5c102a90c1646818cda5b5682ff66b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 05:36:57 +0000 Subject: [PATCH 58/92] python3Packages.pyathena: 3.13.0 -> 3.14.0 --- pkgs/development/python-modules/pyathena/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index d2034dc13b56..0bf6692537e4 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyathena"; - version = "3.13.0"; + version = "3.14.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-kzyV/y3xuf3tOMkL1SwkUCvG/I/1eQneTBUG/xbTbLA="; + hash = "sha256-Dgst0gFmHsQwhScz83cIE7B1xbcSKcYslfCGtm3yuh0="; }; build-system = [ hatchling ]; From 7cdb65eaca2d396f4f8248e66c3f711229fd0ba9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 06:40:23 +0000 Subject: [PATCH 59/92] ctlptl: 0.8.40 -> 0.8.41 --- pkgs/by-name/ct/ctlptl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ct/ctlptl/package.nix b/pkgs/by-name/ct/ctlptl/package.nix index c2f832e33062..49ce61b095e9 100644 --- a/pkgs/by-name/ct/ctlptl/package.nix +++ b/pkgs/by-name/ct/ctlptl/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.40"; + version = "0.8.41"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-O6oAkYzkBUecwAcLjPIR7D/k4REWND8TWdstPNVJ0MU="; + hash = "sha256-PjTgXjA3lP4tzkcnWt711DJtu5/2zR+a2yyYmzf5WvE="; }; - vendorHash = "sha256-1BrohvN3Eefuy2y7pjdwhzFQG9YLr9X/CLbOeTBZkjY="; + vendorHash = "sha256-EYpPZvAhKsKguvDousIs9BTD8fnCcZql3IktKf92wxs="; nativeBuildInputs = [ installShellFiles ]; From d0aba34a4efca6e4e88b41ad91408abc94274b0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 06:45:12 +0000 Subject: [PATCH 60/92] python3Packages.albumentations: 2.0.6 -> 2.0.7 --- pkgs/development/python-modules/albumentations/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/albumentations/default.nix b/pkgs/development/python-modules/albumentations/default.nix index c20117d3b363..a4b62d21c3b9 100644 --- a/pkgs/development/python-modules/albumentations/default.nix +++ b/pkgs/development/python-modules/albumentations/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "albumentations"; - version = "2.0.6"; + version = "2.0.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "albumentations-team"; repo = "albumentations"; tag = version; - hash = "sha256-n00WE8RwwLx/vHRkIrOhrampFPVkPhAkS6zZ4XjEHTk="; + hash = "sha256-3obvlYj+UwniEf+NokJDNqMysCGFXcJdI1Wckdfng2Y="; }; patches = [ @@ -88,7 +88,7 @@ buildPythonPackage rec { meta = { description = "Fast image augmentation library and easy to use wrapper around other libraries"; homepage = "https://github.com/albumentations-team/albumentations"; - changelog = "https://github.com/albumentations-team/albumentations/releases/tag/${version}"; + changelog = "https://github.com/albumentations-team/albumentations/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; }; From 5592fde390ef178da2d4ecadda6fd3cb34e0a9e2 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Mon, 19 May 2025 11:56:24 -0700 Subject: [PATCH 61/92] python3Packages.langchain-community: disable flaky test --- pkgs/development/python-modules/langchain-community/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 95308ed3bab6..fa332452fbbd 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -111,6 +111,8 @@ buildPythonPackage rec { disabledTests = [ # requires bs4, aka BeautifulSoup "test_importable_all" + # flaky + "test_llm_caching_async" ]; disabledTestPaths = [ From 49d7fea2bb56de1d2c717cfc41261d6e61b13d21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 19:33:14 +0000 Subject: [PATCH 62/92] lockbook-desktop: 0.9.22 -> 0.9.23 --- pkgs/by-name/lo/lockbook-desktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix index 06e6a6f40b87..050093fb3f82 100644 --- a/pkgs/by-name/lo/lockbook-desktop/package.nix +++ b/pkgs/by-name/lo/lockbook-desktop/package.nix @@ -18,17 +18,17 @@ let in rustPlatform.buildRustPackage rec { pname = "lockbook-desktop"; - version = "0.9.22"; + version = "0.9.23"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = version; - hash = "sha256-akCtnPLJupoo7n3Vfyl37fjCmK4dHB0bt92rie6k0dQ="; + hash = "sha256-1SHAlhcQFuhwiYQReVOILX2T0gufNBojuy/E/EcECNw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-xH3GIwh3zaLbpZqvzM+KM+K14fWj241RTwUM7dWRCKA="; + cargoHash = "sha256-TAa/HuRDwRr5GBObcQwxebTiBjRrWeq52HFYT9h6Rq4="; nativeBuildInputs = [ pkg-config From 39693262f5b495b28fce7dc7f3e0d805e1ff2c51 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 20 May 2025 11:34:18 +0200 Subject: [PATCH 63/92] SDL2_classic: remove passthru tests --- pkgs/by-name/sd/SDL2_classic/package.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/by-name/sd/SDL2_classic/package.nix b/pkgs/by-name/sd/SDL2_classic/package.nix index 831d5074e772..2c88c50914d9 100644 --- a/pkgs/by-name/sd/SDL2_classic/package.nix +++ b/pkgs/by-name/sd/SDL2_classic/package.nix @@ -48,9 +48,6 @@ withStatic ? stdenv.hostPlatform.isMinGW, # passthru.tests testers, - SDL2_classic_ttf, - SDL2_classic_mixer, - SDL2_classic_image, }: # NOTE: When editing this expression see if the same change applies to @@ -210,11 +207,6 @@ stdenv.mkDerivation (finalAttrs: { }; tests = { pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - inherit - SDL2_classic_ttf - SDL2_classic_mixer - SDL2_classic_image - ; }; }; From 9bf188c26a19eab893ef861d808837f459960c1a Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 20 May 2025 11:26:36 +0200 Subject: [PATCH 64/92] SDL2_classic_ttf: drop --- pkgs/by-name/sd/SDL2_classic_ttf/package.nix | 11 ----------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 pkgs/by-name/sd/SDL2_classic_ttf/package.nix diff --git a/pkgs/by-name/sd/SDL2_classic_ttf/package.nix b/pkgs/by-name/sd/SDL2_classic_ttf/package.nix deleted file mode 100644 index 9190cfc7953e..000000000000 --- a/pkgs/by-name/sd/SDL2_classic_ttf/package.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - SDL2_ttf, - SDL2_classic, -}: - -(SDL2_ttf.override { - SDL2 = SDL2_classic; -}).overrideAttrs - { - pname = "SDL2_classic_ttf"; - } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d767c8eb2842..c4f136e0ddef 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1688,6 +1688,7 @@ mapAliases { SDL_image_2_0 = throw "'SDL_image_2_0' has been removed in favor of the latest version"; # Added 2025-04-20 SDL2_mixer_2_0 = throw "'SDL2_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27 SDL2_classic_mixer_2_0 = throw "'SDL2_classic_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27 + SDL2_classic_ttf = throw "'SDL2_classic_ttf' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_ttf' built with 'sdl2-compat'."; # Added 2025-05-20 s2n = throw "'s2n' has been renamed to/replaced by 's2n-tls'"; # Converted to throw 2024-10-17 sandboxfs = throw "'sandboxfs' has been removed due to being unmaintained, consider using linux namespaces for sandboxing instead"; # Added 2024-06-06 sane-backends-git = throw "'sane-backends-git' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2024-10-17 From 5d67c9920787e018cd6ac8ba2155bed4e638b607 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 20 May 2025 11:28:37 +0200 Subject: [PATCH 65/92] SDL2_classic_mixer: drop --- pkgs/by-name/sd/SDL2_classic_mixer/package.nix | 11 ----------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 pkgs/by-name/sd/SDL2_classic_mixer/package.nix diff --git a/pkgs/by-name/sd/SDL2_classic_mixer/package.nix b/pkgs/by-name/sd/SDL2_classic_mixer/package.nix deleted file mode 100644 index 4aaf22b7cd6e..000000000000 --- a/pkgs/by-name/sd/SDL2_classic_mixer/package.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - SDL2_mixer, - SDL2_classic, -}: - -(SDL2_mixer.override { - SDL2 = SDL2_classic; -}).overrideAttrs - { - pname = "SDL2_classic_mixer"; - } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c4f136e0ddef..e4efb01a8639 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1688,6 +1688,7 @@ mapAliases { SDL_image_2_0 = throw "'SDL_image_2_0' has been removed in favor of the latest version"; # Added 2025-04-20 SDL2_mixer_2_0 = throw "'SDL2_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27 SDL2_classic_mixer_2_0 = throw "'SDL2_classic_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27 + SDL2_classic_mixer = throw "'SDL2_classic_mixer' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_mixer' built with 'sdl2-compat'."; # Added 2025-05-20 SDL2_classic_ttf = throw "'SDL2_classic_ttf' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_ttf' built with 'sdl2-compat'."; # Added 2025-05-20 s2n = throw "'s2n' has been renamed to/replaced by 's2n-tls'"; # Converted to throw 2024-10-17 sandboxfs = throw "'sandboxfs' has been removed due to being unmaintained, consider using linux namespaces for sandboxing instead"; # Added 2024-06-06 From 3e7b6edf80792a107a6a7bbb10f931c3ff03f450 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 20 May 2025 11:33:19 +0200 Subject: [PATCH 66/92] SDL2_classic_image: drop --- pkgs/by-name/sd/SDL2_classic_image/package.nix | 13 ------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 pkgs/by-name/sd/SDL2_classic_image/package.nix diff --git a/pkgs/by-name/sd/SDL2_classic_image/package.nix b/pkgs/by-name/sd/SDL2_classic_image/package.nix deleted file mode 100644 index 6a6f58fc573a..000000000000 --- a/pkgs/by-name/sd/SDL2_classic_image/package.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - SDL2_image, - SDL2_classic, - enableSTB ? true, -}: - -(SDL2_image.override { - SDL2 = SDL2_classic; - inherit enableSTB; -}).overrideAttrs - { - pname = "SDL2_classic_image"; - } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e4efb01a8639..d7144b8ae3dc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1687,6 +1687,7 @@ mapAliases { SDL_gpu = throw "'SDL_gpu' has been removed due to lack of upstream maintenance and known users"; # Added 2025-03-15 SDL_image_2_0 = throw "'SDL_image_2_0' has been removed in favor of the latest version"; # Added 2025-04-20 SDL2_mixer_2_0 = throw "'SDL2_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27 + SDL2_classic_image = throw "'SDL2_classic_image' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_image' built with 'sdl2-compat'."; # Added 2025-05-20 SDL2_classic_mixer_2_0 = throw "'SDL2_classic_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27 SDL2_classic_mixer = throw "'SDL2_classic_mixer' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_mixer' built with 'sdl2-compat'."; # Added 2025-05-20 SDL2_classic_ttf = throw "'SDL2_classic_ttf' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_ttf' built with 'sdl2-compat'."; # Added 2025-05-20 From 67081ee1ba2492f5d985d221e6ed81380ecd1a03 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 20 May 2025 11:36:32 +0200 Subject: [PATCH 67/92] SDL2_classic: drop --- .../sd/SDL2_classic/find-headers.patch | 32 --- pkgs/by-name/sd/SDL2_classic/package.nix | 223 ------------------ pkgs/by-name/sd/SDL2_classic/setup-hook.sh | 7 - pkgs/top-level/aliases.nix | 1 + 4 files changed, 1 insertion(+), 262 deletions(-) delete mode 100644 pkgs/by-name/sd/SDL2_classic/find-headers.patch delete mode 100644 pkgs/by-name/sd/SDL2_classic/package.nix delete mode 100644 pkgs/by-name/sd/SDL2_classic/setup-hook.sh diff --git a/pkgs/by-name/sd/SDL2_classic/find-headers.patch b/pkgs/by-name/sd/SDL2_classic/find-headers.patch deleted file mode 100644 index 8739da91eac1..000000000000 --- a/pkgs/by-name/sd/SDL2_classic/find-headers.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/sdl2-config.cmake.in b/sdl2-config.cmake.in -index db864aab9..b94e16043 100644 ---- a/sdl2-config.cmake.in -+++ b/sdl2-config.cmake.in -@@ -26,7 +26,9 @@ set_and_check(SDL2_EXEC_PREFIX "${exec_prefix}") - set_and_check(SDL2_BINDIR "${bindir}") - set_and_check(SDL2_INCLUDE_DIR "${includedir}/SDL2") - set_and_check(SDL2_LIBDIR "${libdir}") --set(SDL2_INCLUDE_DIRS "${includedir};${SDL2_INCLUDE_DIR}") -+ -+set(SDL2_INCLUDE_DIRS "${includedir};${SDL2_INCLUDE_DIR}" $ENV{SDL2_PATH}) -+separate_arguments(SDL2_INCLUDE_DIRS) - - set(SDL2_LIBRARIES SDL2::SDL2) - set(SDL2_STATIC_LIBRARIES SDL2::SDL2-static) -diff --git a/sdl2-config.in b/sdl2-config.in -index f6eca7668..c0cd94590 100644 ---- a/sdl2-config.in -+++ b/sdl2-config.in -@@ -46,7 +46,11 @@ while test $# -gt 0; do - echo @SDL_VERSION@ - ;; - --cflags) -- echo -I@includedir@/SDL2 @SDL_CFLAGS@ -+ SDL_CFLAGS="" -+ for i in @includedir@/SDL2 $SDL2_PATH; do -+ SDL_CFLAGS="$SDL_CFLAGS -I$i" -+ done -+ echo $SDL_CFLAGS @SDL_CFLAGS@ - ;; - @ENABLE_SHARED_TRUE@ --libs) - @ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ diff --git a/pkgs/by-name/sd/SDL2_classic/package.nix b/pkgs/by-name/sd/SDL2_classic/package.nix deleted file mode 100644 index 2c88c50914d9..000000000000 --- a/pkgs/by-name/sd/SDL2_classic/package.nix +++ /dev/null @@ -1,223 +0,0 @@ -{ - lib, - stdenv, - config, - fetchFromGitHub, - nix-update-script, - pkg-config, - mesa, - libGLSupported ? lib.elem stdenv.hostPlatform.system mesa.meta.platforms, - openglSupport ? libGLSupported, - libGL, - alsaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, - alsa-lib, - x11Support ? !stdenv.hostPlatform.isWindows && !stdenv.hostPlatform.isAndroid, - libX11, - xorgproto, - libICE, - libXi, - libXScrnSaver, - libXcursor, - libXinerama, - libXext, - libXxf86vm, - libXrandr, - waylandSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, - wayland, - wayland-protocols, - wayland-scanner, - drmSupport ? false, - libdrm, - libgbm, - libxkbcommon, - dbusSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, - dbus, - udevSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, - udev, - ibusSupport ? false, - ibus, - libdecorSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, - libdecor, - pipewireSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, - pipewire, # NOTE: must be built with SDL2 without pipewire support - pulseaudioSupport ? - config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, - libpulseaudio, - audiofile, - libiconv, - withStatic ? stdenv.hostPlatform.isMinGW, - # passthru.tests - testers, -}: - -# NOTE: When editing this expression see if the same change applies to -# SDL expression too - -stdenv.mkDerivation (finalAttrs: { - pname = "SDL2"; - version = "2.32.6"; - - src = fetchFromGitHub { - owner = "libsdl-org"; - repo = "SDL"; - rev = "release-${finalAttrs.version}"; - hash = "sha256-sXlW+ivDRCNMcZDzZEfOPGvFGU0aE4n/fO+Wxym6GGw="; - }; - dontDisableStatic = if withStatic then 1 else 0; - outputs = [ - "out" - "dev" - ]; - outputBin = "dev"; # sdl-config - - patches = [ - # `sdl2-config --cflags` from Nixpkgs returns include path to just SDL2. - # On a normal distro this is enough for includes from all SDL2* packages to work, - # but on NixOS they're spread across different paths. - # This patch + the setup-hook will ensure that `sdl2-config --cflags` works correctly. - ./find-headers.patch - ]; - - postPatch = '' - # Fix running wayland-scanner for the build platform when cross-compiling. - # See comment here: https://github.com/libsdl-org/SDL/issues/4860#issuecomment-1119003545 - substituteInPlace configure \ - --replace '$(WAYLAND_SCANNER)' 'wayland-scanner' - ''; - - strictDeps = true; - - depsBuildBuild = [ pkg-config ]; - - nativeBuildInputs = - [ pkg-config ] - ++ lib.optionals waylandSupport [ - wayland - wayland-scanner - ]; - - dlopenPropagatedBuildInputs = - [ ] - # Propagated for #include in SDL_opengles.h. - ++ lib.optional (openglSupport && !stdenv.hostPlatform.isDarwin) libGL - # Propagated for #include and in SDL_syswm.h. - ++ lib.optionals x11Support [ libX11 ]; - - propagatedBuildInputs = - lib.optionals x11Support [ xorgproto ] ++ finalAttrs.dlopenPropagatedBuildInputs; - - dlopenBuildInputs = - lib.optionals alsaSupport [ - alsa-lib - audiofile - ] - ++ lib.optional dbusSupport dbus - ++ lib.optional libdecorSupport libdecor - ++ lib.optional pipewireSupport pipewire - ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optional udevSupport udev - ++ lib.optionals waylandSupport [ - wayland - libxkbcommon - ] - ++ lib.optionals x11Support [ - libICE - libXi - libXScrnSaver - libXcursor - libXinerama - libXext - libXrandr - libXxf86vm - ] - ++ lib.optionals drmSupport [ - libdrm - libgbm - ]; - - buildInputs = - [ libiconv ] - ++ finalAttrs.dlopenBuildInputs - ++ lib.optional ibusSupport ibus - ++ lib.optionals waylandSupport [ wayland-protocols ]; - - enableParallelBuilding = true; - - configureFlags = - [ "--disable-oss" ] - ++ lib.optional (!x11Support) "--without-x" - ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib" - ++ lib.optional stdenv.hostPlatform.isWindows "--disable-video-opengles" - ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-sdltest"; - - # We remove libtool .la files when static libs are requested, - # because they make the builds of downstream libs like `SDL_tff` - # fail with `cannot find -lXext, `-lXcursor` etc. linker errors - # because the `.la` files are not pruned if static libs exist - # (see https://github.com/NixOS/nixpkgs/commit/fd97db43bcb05e37f6bb77f363f1e1e239d9de53) - # and they also don't carry the necessary `-L` paths of their - # X11 dependencies. - # For static linking, it is better to rely on `pkg-config` `.pc` - # files. - postInstall = '' - if [ "$dontDisableStatic" -eq "1" ]; then - rm $out/lib/*.la - else - rm $out/lib/*.a - fi - moveToOutput bin/sdl2-config "$dev" - ''; - - # SDL is weird in that instead of just dynamically linking with - # libraries when you `--enable-*` (or when `configure` finds) them - # it `dlopen`s them at runtime. In principle, this means it can - # ignore any missing optional dependencies like alsa, pulseaudio, - # some x11 libs, wayland, etc if they are missing on the system - # and/or work with wide array of versions of said libraries. In - # nixpkgs, however, we don't need any of that. Moreover, since we - # don't have a global ld-cache we have to stuff all the propagated - # libraries into rpath by hand or else some applications that use - # SDL API that requires said libraries will fail to start. - # - # You can grep SDL sources with `grep -rE 'SDL_(NAME|.*_SYM)'` to - # list the symbols used in this way. - postFixup = - let - rpath = lib.makeLibraryPath ( - finalAttrs.dlopenPropagatedBuildInputs ++ finalAttrs.dlopenBuildInputs - ); - in - lib.optionalString (stdenv.hostPlatform.extensions.sharedLibrary == ".so") '' - for lib in $out/lib/*.so* ; do - if ! [[ -L "$lib" ]]; then - patchelf --set-rpath "$(patchelf --print-rpath $lib):${rpath}" "$lib" - fi - done - ''; - - setupHook = ./setup-hook.sh; - - passthru = { - inherit openglSupport; - updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "release-(2\\..*)" - ]; - }; - tests = { - pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - }; - }; - - meta = with lib; { - description = "Cross-platform multimedia library"; - mainProgram = "sdl2-config"; - homepage = "http://www.libsdl.org/"; - changelog = "https://github.com/libsdl-org/SDL/releases/tag/release-${finalAttrs.version}"; - license = licenses.zlib; - platforms = platforms.all; - teams = [ lib.teams.sdl ]; - pkgConfigModules = [ "sdl2" ]; - }; -}) diff --git a/pkgs/by-name/sd/SDL2_classic/setup-hook.sh b/pkgs/by-name/sd/SDL2_classic/setup-hook.sh deleted file mode 100644 index 0119926491af..000000000000 --- a/pkgs/by-name/sd/SDL2_classic/setup-hook.sh +++ /dev/null @@ -1,7 +0,0 @@ -addSDL2Path () { - if [ -e "$1/include/SDL2" ]; then - export SDL2_PATH="${SDL2_PATH-}${SDL2_PATH:+ }$1/include/SDL2" - fi -} - -addEnvHooks "$hostOffset" addSDL2Path diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d7144b8ae3dc..b80a1efb0249 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1687,6 +1687,7 @@ mapAliases { SDL_gpu = throw "'SDL_gpu' has been removed due to lack of upstream maintenance and known users"; # Added 2025-03-15 SDL_image_2_0 = throw "'SDL_image_2_0' has been removed in favor of the latest version"; # Added 2025-04-20 SDL2_mixer_2_0 = throw "'SDL2_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27 + SDL2_classic = throw "'SDL2_classic' has been removed. Consider upgrading to 'sdl2-compat', also available as 'SDL2'."; # Added 2025-05-20 SDL2_classic_image = throw "'SDL2_classic_image' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_image' built with 'sdl2-compat'."; # Added 2025-05-20 SDL2_classic_mixer_2_0 = throw "'SDL2_classic_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27 SDL2_classic_mixer = throw "'SDL2_classic_mixer' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_mixer' built with 'sdl2-compat'."; # Added 2025-05-20 From c4381dafbc17a9c8c864dfbc05156e95fccd9831 Mon Sep 17 00:00:00 2001 From: Marcos Benevides Date: Sat, 3 May 2025 22:03:41 -0300 Subject: [PATCH 68/92] omnigres: init at 0-unstable-2025-05-16 --------- Co-authored-by: Wolfgang Walther Co-authored-by: Yurii Rashkovskii --- pkgs/servers/sql/postgresql/ext/omnigres.nix | 86 ++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/ext/omnigres.nix diff --git a/pkgs/servers/sql/postgresql/ext/omnigres.nix b/pkgs/servers/sql/postgresql/ext/omnigres.nix new file mode 100644 index 000000000000..c7e967882413 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/omnigres.nix @@ -0,0 +1,86 @@ +{ + brotli, + clang_18, + cmake, + fetchFromGitHub, + flex, + lib, + netcat, + perl, + pkg-config, + postgresql, + postgresqlBuildExtension, + postgresqlTestExtension, + python3, +}: + +let + pgWithExtensions = postgresql.withPackages (ps: [ ps.plpython3 ]); +in +postgresqlBuildExtension (finalAttrs: { + pname = "omnigres"; + version = "0-unstable-2025-05-16"; + + src = fetchFromGitHub { + owner = "omnigres"; + repo = "omnigres"; + rev = "84f14792d80fb6fd60b680b7825245a8e7c5583e"; + hash = "sha256-jOlHXl7ANhMwOPizd5KH+wYZmBNNkkIa9jbXZR8Xu28="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + clang_18 + cmake + flex + netcat + pkg-config + perl + python3 + ]; + + buildInputs = postgresql.buildInputs ++ [ + brotli + ]; + + cmakeFlags = [ + "-DOPENSSL_CONFIGURED=1" + "-DPG_CONFIG=${pgWithExtensions.pg_config}/bin/pg_config" + "-DPostgreSQL_EXTENSION_DIR=${pgWithExtensions}/share/postgresql/extension/" + "-DPostgreSQL_PACKAGE_LIBRARY_DIR=${pgWithExtensions}/lib/" + "-DPostgreSQL_TARGET_EXTENSION_DIR=${builtins.placeholder "out"}/share/postgresql/extension/" + "-DPostgreSQL_TARGET_PACKAGE_LIBRARY_DIR=${builtins.placeholder "out"}/lib/" + ]; + + enableParallelBuilding = true; + doCheck = false; + + preInstall = '' + patchShebangs script_omni* + mkdir -p $out/lib/ + mkdir -p $out/share/postgresql/extension/ + ''; + + # https://github.com/omnigres/omnigres?tab=readme-ov-file#building--using-extensions + installTargets = [ "install_extensions" ]; + + passthru.tests.extension = postgresqlTestExtension { + inherit (finalAttrs) finalPackage; + sql = '' + -- https://docs.omnigres.org/omni_id/identity_type/#usage + CREATE EXTENSION omni_id; + + SELECT identity_type('user_id'); + ''; + }; + + meta = { + description = "Postgres as a Business Operating System"; + homepage = "https://docs.omnigres.org"; + maintainers = with lib.maintainers; [ mtrsk ]; + platforms = postgresql.meta.platforms; + license = lib.licenses.asl20; + broken = lib.versionOlder postgresql.version "14"; + }; +}) From 816aa29cd6535fd97334b3ef5051d08d07b36044 Mon Sep 17 00:00:00 2001 From: Yaya Date: Sun, 18 May 2025 13:57:21 +0200 Subject: [PATCH 69/92] gitlab: 17.11.2 -> 18.0.0 https://gitlab.com/gitlab-org/gitlab/-/blob/v18.0.0-ee/CHANGELOG.md --- .../version-management/gitlab/data.json | 16 +- .../version-management/gitlab/default.nix | 2 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../version-management/gitlab/rubyEnv/Gemfile | 61 +- .../gitlab/rubyEnv/Gemfile.lock | 373 ++++++----- .../gitlab/rubyEnv/gemset.nix | 610 +++++++++++++----- pkgs/by-name/gi/gitaly/git.nix | 4 +- pkgs/by-name/gi/gitaly/package.nix | 6 +- .../gitlab-elasticsearch-indexer/package.nix | 6 +- pkgs/by-name/gi/gitlab-pages/package.nix | 6 +- 10 files changed, 716 insertions(+), 372 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index f33b25035fea..9c83119e467a 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.11.2", - "repo_hash": "1jaxqchqag6q0c4vmrpwnmflv72b2xpskba9b0m4y6w6sy7hqx7q", - "yarn_hash": "0z06jaxqbg2wnq7yhpkba0cpxp4w4iy2cxla8nhc6kgx49xk179v", + "version": "18.0.0", + "repo_hash": "03x2ypyn7kkald6pzvzh19cmlr6km9fdssw823565rd1kikywb87", + "yarn_hash": "0vv09y1pjcm2723jh842pgnmnrf4yqk7558v57dp08rxrqnsni5x", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.11.2-ee", + "rev": "v18.0.0-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.11.2", - "GITLAB_PAGES_VERSION": "17.11.2", + "GITALY_SERVER_VERSION": "18.0.0", + "GITLAB_PAGES_VERSION": "18.0.0", "GITLAB_SHELL_VERSION": "14.41.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.5.0", - "GITLAB_WORKHORSE_VERSION": "17.11.2" + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.5.1", + "GITLAB_WORKHORSE_VERSION": "18.0.0" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index edd5182d79d0..81c204476608 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -82,7 +82,7 @@ let cp Cargo.lock $out ''; }; - hash = "sha256-Jr3lS3gQI/jojWIUxEBp7a950mcOvnbjlRIFXvfGays="; + hash = "sha256-73uliXjZNT8Ok98ai2rY+b0jYqxoQH3qW5YS+Ap6KK0="; }; dontBuild = false; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 4aae178ec9c1..f182dc8d039a 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -10,7 +10,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "17.11.2"; + version = "18.0.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { @@ -22,7 +22,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-76JO/oayqhv36WM7zC/a85l8CK1orsMuMksBYbmDN1o="; + vendorHash = "sha256-tLlxsUCoSGvUpJnS0GsNobk2IuSEgs3R4UDUmNf+HrA="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 6cf985973a9d..e2e58ba5de40 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -1,9 +1,5 @@ # frozen_string_literal: true -def next? - File.basename(__FILE__) == "Gemfile.next" -end - source 'https://rubygems.org' if ENV.fetch('BUNDLER_CHECKSUM_VERIFICATION_OPT_IN', 'false') != 'false' # this verification is still experimental @@ -29,11 +25,7 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir # # See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails -if next? - gem 'rails', '~> 7.1.5.1', feature_category: :shared -else - gem 'rails', '~> 7.0.8.7', feature_category: :shared -end +gem 'rails', '~> 7.1.5.1', feature_category: :shared gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab', feature_category: :shared # This can be dropped after upgrading to Rails 7.2: https://github.com/rails/rails/pull/49674 @@ -88,7 +80,7 @@ gem 'marginalia', '~> 1.11.1', feature_category: :database gem 'declarative_policy', '~> 1.1.0', feature_category: :shared # For source code paths mapping -gem 'coverband', '6.1.4', require: false, feature_category: :shared +gem 'coverband', '6.1.5', require: false, feature_category: :shared # Authentication libraries gem 'devise', '~> 4.9.3', feature_category: :system_access @@ -197,6 +189,10 @@ gem 'hamlit', '~> 2.15.0', feature_category: :shared gem 'carrierwave', '~> 1.3', feature_category: :shared gem 'mini_magick', '~> 4.12', feature_category: :shared +# PDF generation +gem 'prawn', feature_category: :vulnerability_management +gem 'prawn-svg', feature_category: :vulnerability_management + # for backups gem 'fog-aws', '~> 3.26', feature_category: :shared # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. @@ -242,9 +238,9 @@ gem 'seed-fu', '~> 2.3.7', feature_category: :shared gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation', feature_category: :global_search gem 'elasticsearch-api', '7.17.11', feature_category: :global_search -gem 'aws-sdk-core', '~> 3.215.0', feature_category: :global_search +gem 'aws-sdk-core', '~> 3.223.0', feature_category: :global_search gem 'aws-sdk-cloudformation', '~> 1', feature_category: :global_search -gem 'aws-sdk-s3', '~> 1.177.0', feature_category: :global_search +gem 'aws-sdk-s3', '~> 1.185.0', feature_category: :global_search gem 'faraday-typhoeus', '~> 1.1', feature_category: :global_search gem 'faraday_middleware-aws-sigv4', '~> 1.0.1', feature_category: :global_search # Used with Elasticsearch to support http keep-alive connections @@ -270,7 +266,7 @@ gem 'asciidoctor-kroki', '~> 0.10.0', require: false, feature_category: :markdow gem 'rouge', '~> 4.5.0', feature_category: :shared gem 'truncato', '~> 0.7.13', feature_category: :team_planning gem 'nokogiri', '~> 1.18', feature_category: :shared -gem 'gitlab-glfm-markdown', '~> 0.0.29', feature_category: :markdown +gem 'gitlab-glfm-markdown', '~> 0.0.30', feature_category: :markdown gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown gem 'unicode-emoji', '~> 4.0', feature_category: :markdown @@ -319,7 +315,7 @@ gem 're2', '~> 2.15', feature_category: :shared # Misc -gem 'semver_dialects', '~> 3.6', feature_category: :software_composition_analysis +gem 'semver_dialects', '~> 3.7', feature_category: :software_composition_analysis gem 'version_sorter', '~> 2.3', feature_category: :shared gem 'csv_builder', path: 'gems/csv_builder', feature_category: :shared @@ -395,9 +391,9 @@ gem 'gitlab-license', '~> 2.6', feature_category: :shared gem 'rack-attack', '~> 6.7.0', feature_category: :shared # Sentry integration -gem 'sentry-ruby', '~> 5.22.0', feature_category: :observability -gem 'sentry-rails', '~> 5.22.0', feature_category: :observability -gem 'sentry-sidekiq', '~> 5.22.0', feature_category: :observability +gem 'sentry-ruby', '~> 5.23.0', feature_category: :observability +gem 'sentry-rails', '~> 5.23.0', feature_category: :observability +gem 'sentry-sidekiq', '~> 5.23.0', feature_category: :observability # PostgreSQL query parsing # @@ -433,7 +429,7 @@ gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/gems/cloud_profiler_agent' gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics # Metrics -gem 'webrick', '~> 1.8.1', require: false, feature_category: :shared +gem 'webrick', '~> 1.9.0', require: false, feature_category: :shared gem 'prometheus-client-mmap', '~> 1.2.9', require: 'prometheus/client', feature_category: :shared # Event-driven reactor for Ruby @@ -478,7 +474,9 @@ gem 'warning', '~> 1.5.0', feature_category: :shared group :development do gem 'lefthook', '~> 1.11.0', require: false, feature_category: :tooling gem 'rubocop', feature_category: :tooling - gem 'solargraph', '~> 0.47.2', require: false, feature_category: :shared + + gem 'solargraph', '~> 0.54.0', require: false, feature_category: :shared + gem 'solargraph-rspec', '~> 0.5.1', require: false, feature_category: :shared gem 'letter_opener_web', '~> 3.0.0', feature_category: :shared gem 'lookbook', '~> 2.3', feature_category: :shared @@ -505,9 +503,9 @@ group :development do end group :development, :test do - gem 'deprecation_toolkit', '~> 1.5.1', require: false, feature_category: :shared + gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared gem 'bullet', '~> 7.2.0', feature_category: :shared - gem 'parser', '= 3.3.7.1', feature_category: :shared + gem 'parser', '= 3.3.8.0', feature_category: :shared gem 'pry-byebug', feature_category: :shared gem 'pry-rails', '~> 0.3.9', feature_category: :shared gem 'pry-shell', '~> 0.6.4', feature_category: :shared @@ -535,7 +533,7 @@ group :development, :test do gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling gem 'knapsack', '~> 4.0.0', feature_category: :tooling - gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling + gem 'gitlab-crystalball', '~> 0.7.2', require: false, feature_category: :tooling gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling gem 'simple_po_parser', '~> 1.1.6', require: false, feature_category: :shared @@ -559,7 +557,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 4.8.0', require: false, feature_category: :tooling + gem 'gitlab-dangerfiles', '~> 4.9.0', require: false, feature_category: :tooling end group :development, :test, :coverage do @@ -602,11 +600,12 @@ group :test do gem 'rspec_junit_formatter', feature_category: :shared gem 'guard-rspec', feature_category: :shared gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling + gem 'state_machines-rspec', '~> 0.6', feature_category: :shared # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 gem 'derailed_benchmarks', require: false, feature_category: :shared - gem 'gitlab_quality-test_tooling', '~> 2.8.0', require: false, feature_category: :tooling + gem 'gitlab_quality-test_tooling', '~> 2.10.0', require: false, feature_category: :tooling end gem 'octokit', '~> 9.0', feature_category: :importers @@ -646,7 +645,7 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat gem 'gitaly', '~> 17.8.0', feature_category: :gitaly # KAS GRPC protocol definitions -gem 'gitlab-kas-grpc', '~> 17.9.0.pre.rc2', feature_category: :deployment_management +gem 'gitlab-kas-grpc', '~> 17.11.0', feature_category: :deployment_management # Lock the version before issues below are resolved: # https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939 @@ -670,7 +669,7 @@ gem 'lograge', '~> 0.5', feature_category: :shared gem 'grape_logging', '~> 1.8', '>= 1.8.4', feature_category: :api # DNS Lookup -gem 'gitlab-net-dns', '~> 0.10.0', feature_category: :shared +gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :shared # Countries list gem 'countries', '~> 4.0.0', feature_category: :shared @@ -700,7 +699,7 @@ gem 'valid_email', '~> 0.1', feature_category: :shared # JSON gem 'jsonb_accessor', '~> 1.4', feature_category: :shared -gem 'json', '~> 2.10.0', feature_category: :shared +gem 'json', '~> 2.11.0', feature_category: :shared gem 'json_schemer', '~> 2.3.0', feature_category: :shared gem 'oj', '~> 3.16.0', '>=3.16.10', feature_category: :shared gem 'oj-introspect', '~> 0.8', feature_category: :shared @@ -716,7 +715,7 @@ gem 'parslet', '~> 1.8', feature_category: :shared gem 'ipynbdiff', path: 'gems/ipynbdiff', require: 'ipynb_diff', feature_category: :shared -gem 'ed25519', '~> 1.3.0', feature_category: :shared +gem 'ed25519', '~> 1.4.0', feature_category: :shared # Error Tracking OpenAPI client # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature @@ -729,7 +728,7 @@ gem 'cvss-suite', '~> 3.3.0', require: 'cvss_suite', feature_category: :software gem 'arr-pm', '~> 0.0.12', feature_category: :package_registry # Remote Development -gem 'devfile', '~> 0.4.3', feature_category: :workspaces +gem 'devfile', '~> 0.4.4', feature_category: :workspaces # Apple plist parsing gem 'CFPropertyList', '~> 3.0.0', feature_category: :mobile_devops @@ -756,8 +755,8 @@ gem 'duo_api', '~> 1.3', feature_category: :system_access gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation -gem 'paper_trail', '~> 15.0', feature_category: :shared +gem 'paper_trail', '~> 16.0', feature_category: :shared gem "i18n_data", "~> 0.13.1", feature_category: :system_access -gem "gitlab-cloud-connector", "~> 1.5", require: 'gitlab/cloud_connector', feature_category: :cloud_connector +gem "gitlab-cloud-connector", "~> 1.11", require: 'gitlab/cloud_connector', feature_category: :cloud_connector diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index ca362ac5163c..6b6cd2b37bf5 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -42,6 +42,7 @@ PATH activerecord (>= 7) activesupport (>= 7) addressable (~> 2.8) + bigdecimal (~> 3.1) concurrent-ruby (~> 1.1) faraday (~> 2) google-cloud-storage_transfer (~> 1.2.0) @@ -52,6 +53,7 @@ PATH jwt (~> 2.5) logger (~> 1.5) minitest (~> 5.11.0) + mutex_m (~> 0.3) parallel (~> 1.19) pg (~> 1.5.6) rack (~> 2.2.9) @@ -225,73 +227,85 @@ GEM base64 (~> 0.2.0) faraday (>= 1.0, < 3.0.0) faraday-retry (>= 1.0, < 3.0.0) - actioncable (7.0.8.7) - actionpack (= 7.0.8.7) - activesupport (= 7.0.8.7) + actioncable (7.1.5.1) + actionpack (= 7.1.5.1) + activesupport (= 7.1.5.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.7) - actionpack (= 7.0.8.7) - activejob (= 7.0.8.7) - activerecord (= 7.0.8.7) - activestorage (= 7.0.8.7) - activesupport (= 7.0.8.7) + zeitwerk (~> 2.6) + actionmailbox (7.1.5.1) + actionpack (= 7.1.5.1) + activejob (= 7.1.5.1) + activerecord (= 7.1.5.1) + activestorage (= 7.1.5.1) + activesupport (= 7.1.5.1) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8.7) - actionpack (= 7.0.8.7) - actionview (= 7.0.8.7) - activejob (= 7.0.8.7) - activesupport (= 7.0.8.7) + actionmailer (7.1.5.1) + actionpack (= 7.1.5.1) + actionview (= 7.1.5.1) + activejob (= 7.1.5.1) + activesupport (= 7.1.5.1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.8.7) - actionview (= 7.0.8.7) - activesupport (= 7.0.8.7) - rack (~> 2.0, >= 2.2.4) + rails-dom-testing (~> 2.2) + actionpack (7.1.5.1) + actionview (= 7.1.5.1) + activesupport (= 7.1.5.1) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8.7) - actionpack (= 7.0.8.7) - activerecord (= 7.0.8.7) - activestorage (= 7.0.8.7) - activesupport (= 7.0.8.7) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actiontext (7.1.5.1) + actionpack (= 7.1.5.1) + activerecord (= 7.1.5.1) + activestorage (= 7.1.5.1) + activesupport (= 7.1.5.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.7) - activesupport (= 7.0.8.7) + actionview (7.1.5.1) + activesupport (= 7.1.5.1) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8.7) - activesupport (= 7.0.8.7) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.1.5.1) + activesupport (= 7.1.5.1) globalid (>= 0.3.6) - activemodel (7.0.8.7) - activesupport (= 7.0.8.7) - activerecord (7.0.8.7) - activemodel (= 7.0.8.7) - activesupport (= 7.0.8.7) + activemodel (7.1.5.1) + activesupport (= 7.1.5.1) + activerecord (7.1.5.1) + activemodel (= 7.1.5.1) + activesupport (= 7.1.5.1) + timeout (>= 0.4.0) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (7.0.8.7) - actionpack (= 7.0.8.7) - activejob (= 7.0.8.7) - activerecord (= 7.0.8.7) - activesupport (= 7.0.8.7) + activestorage (7.1.5.1) + actionpack (= 7.1.5.1) + activejob (= 7.1.5.1) + activerecord (= 7.1.5.1) + activesupport (= 7.1.5.1) marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.8.7) + activesupport (7.1.5.1) + base64 + benchmark (>= 0.3) + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) + mutex_m + securerandom (>= 0.3) tzinfo (~> 2.0) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) @@ -336,26 +350,28 @@ GEM aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.215.0) + aws-sdk-core (3.223.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) + base64 jmespath (~> 1, >= 1.6.1) + logger aws-sdk-kms (1.76.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.177.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-s3 (1.185.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) - axe-core-api (4.10.2) + axe-core-api (4.10.3) dumb_delegator ostruct virtus - axe-core-rspec (4.10.2) - axe-core-api (= 4.10.2) + axe-core-rspec (4.10.3) + axe-core-api (= 4.10.3) dumb_delegator ostruct virtus @@ -369,7 +385,7 @@ GEM base64 (0.2.0) batch-loader (2.0.5) bcrypt (3.1.20) - benchmark (0.2.0) + benchmark (0.4.0) benchmark-ips (2.14.0) benchmark-malloc (0.2.0) benchmark-memory (0.2.0) @@ -391,7 +407,7 @@ GEM bullet (7.2.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) - byebug (11.1.3) + byebug (12.0.0) capybara (3.40.0) addressable matrix @@ -435,7 +451,7 @@ GEM colored2 (3.1.2) commonmarker (0.23.11) concurrent-ruby (1.2.3) - connection_pool (2.5.0) + connection_pool (2.5.3) console (1.29.2) fiber-annotation fiber-local (~> 1.1) @@ -448,14 +464,13 @@ GEM countries (4.0.1) i18n_data (~> 0.13.0) sixarm_ruby_unaccent (~> 1.1) - coverband (6.1.4) + coverband (6.1.5) + base64 redis (>= 3.0) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.6) creole (0.5.0) - crystalball (0.7.0) - git css_parser (1.14.0) addressable cssbundling-rails (1.4.3) @@ -489,8 +504,8 @@ GEM html-pipeline (~> 2.0) declarative (0.0.20) declarative_policy (1.1.0) - deprecation_toolkit (1.5.1) - activesupport (>= 4.2) + deprecation_toolkit (2.2.3) + activesupport (>= 6.1) derailed_benchmarks (2.2.1) base64 benchmark-ips (~> 2) @@ -511,7 +526,7 @@ GEM thor (>= 0.19, < 2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devfile (0.4.3) + devfile (0.4.4) device_detector (1.0.0) devise (4.9.4) bcrypt (~> 3.0) @@ -534,7 +549,7 @@ GEM docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - doorkeeper (5.8.1) + doorkeeper (5.8.2) railties (>= 5) doorkeeper-device_authorization_grant (1.0.3) doorkeeper (~> 5.5) @@ -561,8 +576,7 @@ GEM zeitwerk (~> 2.6) dumb_delegator (1.0.0) duo_api (1.4.0) - e2mmap (0.1.0) - ed25519 (1.3.0) + ed25519 (1.4.0) elasticsearch (7.17.11) elasticsearch-api (= 7.17.11) elasticsearch-transport (= 7.17.11) @@ -627,9 +641,11 @@ GEM aws-sigv4 (~> 1.0) faraday (>= 2.0, < 3) fast_blank (1.0.1) - fast_gettext (2.3.0) + fast_gettext (4.1.0) + prime + racc ffaker (2.24.0) - ffi (1.17.1) + ffi (1.17.2) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -683,7 +699,7 @@ GEM multi_json (~> 1.10) fog-local (0.8.0) fog-core (>= 1.27, < 3.0) - fog-xml (0.1.3) + fog-xml (0.1.5) fog-core nokogiri (>= 1.5.11, < 2.0.0) formatador (0.2.5) @@ -724,10 +740,12 @@ GEM terminal-table (>= 1.5.1) gitlab-chronic (0.10.6) numerizer (~> 0.2) - gitlab-cloud-connector (1.6.0) + gitlab-cloud-connector (1.12.0) activesupport (~> 7.0) jwt (~> 2.9.3) - gitlab-dangerfiles (4.8.1) + gitlab-crystalball (0.7.2) + git (< 4) + gitlab-dangerfiles (4.9.1) danger (>= 9.3.0) danger-gitlab (>= 8.0.0) rake (~> 13.0) @@ -743,9 +761,9 @@ GEM mime-types net-http-persistent (~> 4.0) nokogiri (~> 1, >= 1.10.8) - gitlab-glfm-markdown (0.0.29) + gitlab-glfm-markdown (0.0.30) rb_sys (~> 0.9.109) - gitlab-kas-grpc (17.9.1) + gitlab-kas-grpc (17.11.2) grpc (~> 1.0) gitlab-labkit (0.37.0) actionpack (>= 5.0.0, < 8.1.0) @@ -763,14 +781,14 @@ GEM redis (>= 5, < 6) redis-namespace (>= 1.8.2) gitlab-markup (2.0.0) - gitlab-net-dns (0.10.0) + gitlab-net-dns (0.12.0) + logger gitlab-sdk (0.3.1) activesupport (>= 5.2.0) rake (~> 13.0) snowplow-tracker (~> 0.8.0) - gitlab-secret_detection (0.23.0) + gitlab-secret_detection (0.26.1) grpc (~> 1.63.0) - grpc-tools (~> 1.63) grpc_reflection (~> 0.1) parallel (~> 1) re2 (~> 2.7) @@ -796,8 +814,8 @@ GEM omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (2.8.0) - activesupport (>= 7.0, < 7.2) + gitlab_quality-test_tooling (2.10.0) + activesupport (>= 7.0, < 7.3) amatch (~> 0.4.1) fog-google (~> 1.24, >= 1.24.1) gitlab (>= 4.19, < 6.0) @@ -891,12 +909,12 @@ GEM google-cloud-storage_transfer-v1 (0.8.0) gapic-common (>= 0.20.0, < 2.a) google-cloud-errors (~> 1.0) - google-protobuf (3.25.6) + google-protobuf (3.25.7) googleapis-common-protos (1.4.0) google-protobuf (~> 3.14) googleapis-common-protos-types (~> 1.2) grpc (~> 1.27) - googleapis-common-protos-types (1.18.0) + googleapis-common-protos-types (1.19.0) google-protobuf (>= 3.18, < 5.a) googleauth (1.8.1) faraday (>= 0.17.3, < 3.a) @@ -950,7 +968,6 @@ GEM google-protobuf (~> 3.18) googleapis-common-protos (~> 1.4) grpc (~> 1.41) - grpc-tools (1.69.0) grpc_reflection (0.1.1) grpc gssapi (1.3.1) @@ -972,7 +989,7 @@ GEM haml (5.2.2) temple (>= 0.8.0) tilt - haml_lint (0.61.0) + haml_lint (0.62.0) haml (>= 5.0) parallel (~> 1.10) rainbow @@ -1024,12 +1041,17 @@ GEM csv invisible_captcha (2.1.0) rails (>= 5.2) + io-console (0.8.0) io-event (1.9.0) ipaddress (0.8.3) + irb (1.15.1) + pp (>= 0.6.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) jaeger-client (1.1.0) opentracing (~> 0.3) thrift - jaro_winkler (1.5.6) + jaro_winkler (1.6.0) jira-ruby (2.3.0) activesupport atlassian-jwt @@ -1040,7 +1062,7 @@ GEM character_set (~> 1.4) regexp_parser (~> 2.5) regexp_property_values (~> 1.0) - json (2.10.2) + json (2.11.3) json-jwt (1.16.6) activesupport (>= 4.2) aes_key_wrap @@ -1087,7 +1109,7 @@ GEM language_server-protocol (3.17.0.3) launchy (2.5.2) addressable (~> 2.8) - lefthook (1.11.2) + lefthook (1.11.5) letter_opener (1.10.0) launchy (>= 2.2, < 4) letter_opener_web (3.0.0) @@ -1104,10 +1126,10 @@ GEM tomlrb (>= 1.3, < 2.1) with_env (= 1.1.0) xml-simple (~> 1.1.9) - licensee (9.17.1) + licensee (9.18.0) dotenv (>= 2, < 4) octokit (>= 4.20, < 10.0) - reverse_markdown (>= 1, < 3) + reverse_markdown (>= 1, < 4) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) listen (3.7.1) @@ -1165,7 +1187,8 @@ GEM mixlib-cli (2.1.8) mixlib-config (3.0.27) tomlrb - mixlib-log (3.0.9) + mixlib-log (3.2.3) + ffi (>= 1.15.5) mixlib-shellout (3.2.7) chef-utils mize (0.6.1) @@ -1203,7 +1226,7 @@ GEM nio4r (2.7.0) nkf (0.2.0) no_proxy_fix (0.1.2) - nokogiri (1.18.7) + nokogiri (1.18.8) mini_portile2 (~> 2.8.2) racc (~> 1.4) notiffany (0.1.3) @@ -1218,6 +1241,7 @@ GEM rack (>= 1.2, < 4) snaky_hash (~> 2.0) version_gem (~> 1.1) + observer (0.1.2) octokit (9.2.0) faraday (>= 1, < 3) sawyer (~> 0.9) @@ -1424,16 +1448,17 @@ GEM diff-lcs (~> 1.5) expgen (~> 0.1) rainbow (~> 3.1.1) - paper_trail (15.1.0) + paper_trail (16.0.0) activerecord (>= 6.1) request_store (~> 1.4) parallel (1.26.3) - parser (3.3.7.1) + parser (3.3.8.0) ast (~> 2.4.1) racc parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) + pdf-core (0.10.0) peek (1.1.0) railties (>= 4.0.0) pg (1.5.9) @@ -1441,6 +1466,17 @@ GEM google-protobuf (>= 3.25.3) plist (3.7.0) png_quantizator (0.2.1) + pp (0.6.2) + prettyprint + prawn (2.5.0) + matrix (~> 0.4) + pdf-core (~> 0.10.0) + ttfunk (~> 1.8) + prawn-svg (0.37.0) + css_parser (~> 1.6) + matrix (~> 0.4.2) + prawn (>= 0.11.1, < 3) + rexml (>= 3.3.9, < 4) premailer (1.23.0) addressable css_parser (>= 1.12.0) @@ -1449,6 +1485,7 @@ GEM actionmailer (>= 3) net-smtp premailer (~> 1.7, >= 1.7.9) + prettyprint (0.2.0) prime (0.1.3) forwardable singleton @@ -1465,15 +1502,18 @@ GEM pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - pry-byebug (3.10.1) - byebug (~> 11.0) - pry (>= 0.13, < 0.15) + pry-byebug (3.11.0) + byebug (~> 12.0) + pry (>= 0.13, < 0.16) pry-rails (0.3.11) pry (>= 0.13.0) pry-shell (0.6.4) pry (>= 0.13.0) tty-markdown tty-prompt + psych (5.2.3) + date + stringio public_suffix (6.0.1) puma (6.5.0) nio4r (~> 2.0) @@ -1503,26 +1543,30 @@ GEM rack-test (2.1.0) rack (>= 1.3) rack-timeout (0.7.0) - rails (7.0.8.7) - actioncable (= 7.0.8.7) - actionmailbox (= 7.0.8.7) - actionmailer (= 7.0.8.7) - actionpack (= 7.0.8.7) - actiontext (= 7.0.8.7) - actionview (= 7.0.8.7) - activejob (= 7.0.8.7) - activemodel (= 7.0.8.7) - activerecord (= 7.0.8.7) - activestorage (= 7.0.8.7) - activesupport (= 7.0.8.7) + rackup (1.0.1) + rack (< 3) + webrick + rails (7.1.5.1) + actioncable (= 7.1.5.1) + actionmailbox (= 7.1.5.1) + actionmailer (= 7.1.5.1) + actionpack (= 7.1.5.1) + actiontext (= 7.1.5.1) + actionview (= 7.1.5.1) + activejob (= 7.1.5.1) + activemodel (= 7.1.5.1) + activerecord (= 7.1.5.1) + activestorage (= 7.1.5.1) + activesupport (= 7.1.5.1) bundler (>= 1.15.0) - railties (= 7.0.8.7) + railties (= 7.1.5.1) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) rails-html-sanitizer (1.6.1) loofah (~> 2.21) @@ -1530,13 +1574,14 @@ GEM rails-i18n (7.0.10) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.0.8.7) - actionpack (= 7.0.8.7) - activesupport (= 7.0.8.7) - method_source + railties (7.1.5.1) + actionpack (= 7.1.5.1) + activesupport (= 7.1.5.1) + irb + rackup (>= 1.0.0) rake (>= 12.2) - thor (~> 1.0) - zeitwerk (~> 2.5) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.0.6) rake-compiler-dock (1.9.1) @@ -1552,6 +1597,8 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rchardet (1.8.0) + rdoc (6.13.0) + psych (>= 4.0.0) re2 (2.15.0) mini_portile2 (~> 2.8.7) recaptcha (5.12.3) @@ -1580,6 +1627,8 @@ GEM redis (>= 4, < 6) regexp_parser (2.10.0) regexp_property_values (1.0.0) + reline (0.6.0) + io-console (~> 0.5) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -1595,7 +1644,7 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) retriable (3.1.2) - reverse_markdown (1.4.0) + reverse_markdown (3.0.0) nokogiri rexml (3.4.1) rinku (2.0.0) @@ -1684,7 +1733,7 @@ GEM ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) - ruby-lsp (0.23.13) + ruby-lsp (0.23.15) language_server-protocol (~> 3.17.0) prism (>= 1.2, < 2.0) rbs (>= 3, < 4) @@ -1718,6 +1767,7 @@ GEM addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) sd_notify (0.1.1) + securerandom (0.4.1) seed-fu (2.3.9) activerecord (>= 3.1) activesupport (>= 3.1) @@ -1727,19 +1777,19 @@ GEM rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - semver_dialects (3.6.0) + semver_dialects (3.7.0) deb_version (~> 1.0.1) pastel (~> 0.8.0) thor (~> 1.3) tty-command (~> 0.10.1) - sentry-rails (5.22.1) + sentry-rails (5.23.0) railties (>= 5.0) - sentry-ruby (~> 5.22.1) - sentry-ruby (5.22.1) + sentry-ruby (~> 5.23.0) + sentry-ruby (5.23.0) bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) - sentry-sidekiq (5.22.1) - sentry-ruby (~> 5.22.1) + sentry-sidekiq (5.23.0) + sentry-ruby (~> 5.23.0) sidekiq (>= 3.0) shellany (0.0.1) shoulda-matchers (6.4.0) @@ -1780,21 +1830,27 @@ GEM hashie version_gem (~> 1.1) snowplow-tracker (0.8.0) - solargraph (0.47.2) + solargraph (0.54.2) backport (~> 1.2) - benchmark - bundler (>= 1.17.2) + benchmark (~> 0.4) + bundler (~> 2.0) diff-lcs (~> 1.4) - e2mmap - jaro_winkler (~> 1.5) + jaro_winkler (~> 1.6) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.1) + logger (~> 1.6) + observer (~> 0.1) + ostruct (~> 0.6) parser (~> 3.0) - reverse_markdown (>= 1.0.5, < 3) - rubocop (>= 0.52) + rbs (~> 3.3) + reverse_markdown (~> 3.0) + rubocop (~> 1.38) thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) + yard-solargraph (~> 0.1) + solargraph-rspec (0.5.1) + solargraph (~> 0.52, >= 0.52.0) sorbet-runtime (0.5.11647) spamcheck (1.3.3) grpc (~> 1.63) @@ -1819,6 +1875,11 @@ GEM state_machines-activerecord (0.8.0) activerecord (>= 5.1) state_machines-activemodel (>= 0.8.0) + state_machines-rspec (0.6.0) + activesupport + rspec (~> 3.3) + state_machines + stringio (3.1.7) strings (0.2.1) strings-ansi (~> 0.2) unicode-display_width (>= 1.5, < 3.0) @@ -1878,6 +1939,8 @@ GEM truncato (0.7.13) htmlentities (~> 4.3.1) nokogiri (>= 1.7.0, <= 2.0) + ttfunk (1.8.0) + bigdecimal (~> 3.1) tty-color (0.6.0) tty-command (0.10.1) pastel (~> 0.8) @@ -1943,7 +2006,7 @@ GEM vite_rails (3.0.19) railties (>= 5.1, < 9) vite_ruby (~> 3.0, >= 3.2.2) - vite_ruby (3.9.1) + vite_ruby (3.9.2) dry-cli (>= 0.7, < 2) logger (~> 1.6) mutex_m @@ -1970,7 +2033,7 @@ GEM addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.8.2) + webrick (1.9.1) websocket (1.2.10) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) @@ -1988,6 +2051,8 @@ GEM nokogiri (~> 1.8) yajl-ruby (1.4.3) yard (0.9.37) + yard-solargraph (0.1.0) + yard (~> 0.9) zeitwerk (2.6.7) PLATFORMS @@ -2013,8 +2078,8 @@ DEPENDENCIES attr_encrypted (~> 3.2.4)! awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.215.0) - aws-sdk-s3 (~> 1.177.0) + aws-sdk-core (~> 3.223.0) + aws-sdk-s3 (~> 1.185.0) axe-core-rspec (~> 4.10.0) babosa (~> 2.0) base32 (~> 0.3.0) @@ -2038,18 +2103,17 @@ DEPENDENCIES concurrent-ruby (~> 1.1) connection_pool (~> 2.4) countries (~> 4.0.0) - coverband (= 6.1.4) + coverband (= 6.1.5) creole (~> 0.5.0) - crystalball (~> 0.7.0) cssbundling-rails (= 1.4.3) csv_builder! cvss-suite (~> 3.3.0) database_cleaner-active_record (~> 2.2.0) deckar01-task_list (= 2.3.4) declarative_policy (~> 1.1.0) - deprecation_toolkit (~> 1.5.1) + deprecation_toolkit (~> 2.2.3) derailed_benchmarks - devfile (~> 0.4.3) + devfile (~> 0.4.4) device_detector devise (~> 4.9.3) devise-pbkdf2-encryptable (~> 0.0.0)! @@ -2062,7 +2126,7 @@ DEPENDENCIES doorkeeper-openid_connect (~> 1.8.10) drb (~> 2.2) duo_api (~> 1.3) - ed25519 (~> 1.3.0) + ed25519 (~> 1.4.0) elasticsearch-api (= 7.17.11) elasticsearch-model (~> 7.2) elasticsearch-rails (~> 7.2) @@ -2095,20 +2159,21 @@ DEPENDENCIES gitlab-active-context! gitlab-backup-cli! gitlab-chronic (~> 0.10.5) - gitlab-cloud-connector (~> 1.5) - gitlab-dangerfiles (~> 4.8.0) + gitlab-cloud-connector (~> 1.11) + gitlab-crystalball (~> 0.7.2) + gitlab-dangerfiles (~> 4.9.0) gitlab-duo-workflow-service-client (~> 0.1)! gitlab-experiment (~> 0.9.1) gitlab-fog-azure-rm (~> 2.2.0) - gitlab-glfm-markdown (~> 0.0.29) + gitlab-glfm-markdown (~> 0.0.30) gitlab-housekeeper! gitlab-http! - gitlab-kas-grpc (~> 17.9.0.pre.rc2) + gitlab-kas-grpc (~> 17.11.0) gitlab-labkit (~> 0.37.0) gitlab-license (~> 2.6) gitlab-mail_room (~> 0.0.24) gitlab-markup (~> 2.0.0) - gitlab-net-dns (~> 0.10.0) + gitlab-net-dns (~> 0.12.0) gitlab-rspec! gitlab-rspec_flaky! gitlab-safe_request_store! @@ -2122,7 +2187,7 @@ DEPENDENCIES gitlab-utils! gitlab_chronic_duration (~> 0.12) gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 2.8.0) + gitlab_quality-test_tooling (~> 2.10.0) gon (~> 6.4.0) google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-cloudbilling_v1 (~> 0.22.0) @@ -2168,7 +2233,7 @@ DEPENDENCIES ipynbdiff! jira-ruby (~> 2.3.0) js_regex (~> 3.8) - json (~> 2.10.0) + json (~> 2.11.0) json_schemer (~> 2.3.0) jsonb_accessor (~> 1.4) jwt (~> 2.9.3) @@ -2249,14 +2314,16 @@ DEPENDENCIES org-ruby (~> 0.9.12) os (~> 1.1, >= 1.1.4) pact (~> 1.64) - paper_trail (~> 15.0) + paper_trail (~> 16.0) parallel (~> 1.19) - parser (= 3.3.7.1) + parser (= 3.3.8.0) parslet (~> 1.8) peek (~> 1.1) pg (~> 1.5.6) pg_query (~> 6.1.0) png_quantizator (~> 0.2.1) + prawn + prawn-svg premailer-rails (~> 1.12.0) prometheus-client-mmap (~> 1.2.9) pry-byebug @@ -2269,7 +2336,7 @@ DEPENDENCIES rack-oauth2 (~> 2.2.1) rack-proxy (~> 0.7.7) rack-timeout (~> 0.7.0) - rails (~> 7.0.8.7) + rails (~> 7.1.5.1) rails-controller-testing rails-i18n (~> 7.0, >= 7.0.9) rainbow (~> 3.0) @@ -2305,10 +2372,10 @@ DEPENDENCIES sd_notify (~> 0.1.0) seed-fu (~> 2.3.7) selenium-webdriver (~> 4.21, >= 4.21.1) - semver_dialects (~> 3.6) - sentry-rails (~> 5.22.0) - sentry-ruby (~> 5.22.0) - sentry-sidekiq (~> 5.22.0) + semver_dialects (~> 3.7) + sentry-rails (~> 5.23.0) + sentry-ruby (~> 5.23.0) + sentry-sidekiq (~> 5.23.0) shoulda-matchers (~> 6.4.0) sidekiq (~> 7.3.9) sidekiq-cron (~> 1.12.0) @@ -2319,7 +2386,8 @@ DEPENDENCIES simplecov-lcov (~> 0.8.0) slack-messenger (~> 2.3.5) snowplow-tracker (~> 0.8.0) - solargraph (~> 0.47.2) + solargraph (~> 0.54.0) + solargraph-rspec (~> 0.5.1) spamcheck (~> 1.3.0) spring (~> 4.3.0) spring-commands-rspec (~> 1.0.4) @@ -2329,6 +2397,7 @@ DEPENDENCIES ssh_data (~> 1.3) stackprof (~> 0.2.26) state_machines-activerecord (~> 0.8.0) + state_machines-rspec (~> 0.6) sys-filesystem (~> 1.4.3) tanuki_emoji (~> 0.13) telesignenterprise (~> 2.2) @@ -2355,7 +2424,7 @@ DEPENDENCIES warning (~> 1.5.0) webauthn (~> 3.0) webmock (~> 3.25.0) - webrick (~> 1.8.1) + webrick (~> 1.9.0) wikicloth (= 0.8.1) yajl-ruby (~> 1.4.3) yard (~> 0.9) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index ce146b975865..42cb501aac19 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -20,6 +20,7 @@ src: { "activesupport" "nio4r" "websocket-driver" + "zeitwerk" ]; groups = [ "default" @@ -29,10 +30,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qpiw9n8sswisvji91ra290wiihgl30kg3zkpffx0byz84w52d20"; + sha256 = "03dai8z2dxb2cf29hp6md7bhysyipxvw2qnm2bj98yyrnaskfikn"; type = "gem"; }; - version = "7.0.8.7"; + version = "7.1.5.1"; }; actionmailbox = { dependencies = [ @@ -54,10 +55,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hn1d8fshkfijsmwflnvn2ys9i8k3rbkk7h6qsgwspg8v2iyl3ll"; + sha256 = "02inlpsmjz8rz159ljhzac1dvzq5k1pnmmx2pf4gmrj3zs4hbhn3"; type = "gem"; }; - version = "7.0.8.7"; + version = "7.1.5.1"; }; actionmailer = { dependencies = [ @@ -79,16 +80,19 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "054dv081ysp86im4hxcwwlmkl2zidnmy34mw4acghjkpz2igks4b"; + sha256 = "0ncplhcrxldj6jvbaw9g8ik4cznjlf3lyfzgrwy0jfxjh3cdc4xj"; type = "gem"; }; - version = "7.0.8.7"; + version = "7.1.5.1"; }; actionpack = { dependencies = [ "actionview" "activesupport" + "nokogiri" + "racc" "rack" + "rack-session" "rack-test" "rails-dom-testing" "rails-html-sanitizer" @@ -101,10 +105,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0b2y7wy6gx59zb88v1fqiyxdkafrsfma67sx5394yjlhhzbb3rj0"; + sha256 = "066p70mngqk8m7qp3wq2frbl1w8imdcrdxb06cxwq5izykcn7hib"; type = "gem"; }; - version = "7.0.8.7"; + version = "7.1.5.1"; }; actiontext = { dependencies = [ @@ -123,10 +127,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1818spc73y96n94jssh77z2w4dnz84sn83ywrk5cicnmjzdx4xfb"; + sha256 = "1v7psa946frm79x04vywnd0h069jgxy5xghm7y5sgijvmp7n3qmq"; type = "gem"; }; - version = "7.0.8.7"; + version = "7.1.5.1"; }; actionview = { dependencies = [ @@ -145,10 +149,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vbziywvidi7gy69hqxsrcxh6n8i4x2w75qam1fzw0qrqv4mp5xy"; + sha256 = "1apnqjfwbvyhf7svlamal1pvy2x78fk42lqbnllqwy816lhrlmcc"; type = "gem"; }; - version = "7.0.8.7"; + version = "7.1.5.1"; }; activejob = { dependencies = [ @@ -163,10 +167,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "081a32z17976kgf7a51blh7fsxsm3p8qj02p8wx8cd7fx8xdpx7g"; + sha256 = "0rspwfvhxs5by6im90rrjp2sy1wzdpcgb9xm0qfljk3zhmn3fcvn"; type = "gem"; }; - version = "7.0.8.7"; + version = "7.1.5.1"; }; activemodel = { dependencies = [ "activesupport" ]; @@ -179,15 +183,16 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "10qaykhcs15wgyy9fd886mwdkf3iwsib0h6fcnwqa7jw0nxh8fzi"; + sha256 = "1wci45aas8g909zby9j91m87ff5j28qwl0i7izzbszsahmk78wkl"; type = "gem"; }; - version = "7.0.8.7"; + version = "7.1.5.1"; }; activerecord = { dependencies = [ "activemodel" "activesupport" + "timeout" ]; groups = [ "default" @@ -198,10 +203,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0nm4y9fy19l65c18v3k8s3x2npp7kcn8ds2y5i38x8aq1r8whkzr"; + sha256 = "1qzij5xmsqqxsc9v9kil68aif5bvly06vqf4pnjrnfzkkdhd22pl"; type = "gem"; }; - version = "7.0.8.7"; + version = "7.1.5.1"; }; activerecord-explain-analyze = { dependencies = [ @@ -234,7 +239,6 @@ src: { "activerecord" "activesupport" "marcel" - "mini_mime" ]; groups = [ "default" @@ -244,16 +248,24 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xcy76cwskwfm39lr4cg7bmknc8j0vymp55h8hzrhl1sfdriwhfa"; + sha256 = "0qzz8dxwj70zys1lmqk1x0sl4rb7ddw6v2bgmpm6dijqd03qnsxf"; type = "gem"; }; - version = "7.0.8.7"; + version = "7.1.5.1"; }; activesupport = { dependencies = [ + "base64" + "benchmark" + "bigdecimal" "concurrent-ruby" + "connection_pool" + "drb" "i18n" + "logger" "minitest" + "mutex_m" + "securerandom" "tzinfo" ]; groups = [ @@ -265,10 +277,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1zq4f834my1z6yh05rfr1dzl3i8padh33j092zlal979blvh4iyz"; + sha256 = "1f6gqyl49hdabid5jkrfq0127gd396srsgpy7p5ni61v8wp4h34z"; type = "gem"; }; - version = "7.0.8.7"; + version = "7.1.5.1"; }; addressable = { dependencies = [ "public_suffix" ]; @@ -554,16 +566,18 @@ src: { "aws-eventstream" "aws-partitions" "aws-sigv4" + "base64" "jmespath" + "logger" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jafdv62q1cd8yvn6cl876bnz5vp6b4x2gnggsl0j4lyfkxnhh91"; + sha256 = "0xwcimg5i93ansmmww7ap8k6xxyijkxa8p896bxj9kc7cw8hkhyq"; type = "gem"; }; - version = "3.215.0"; + version = "3.223.0"; }; aws-sdk-kms = { dependencies = [ @@ -589,10 +603,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "10ziy8zslfjs0ihls7wiq6zvsncq89azh36rshmlylry1hhxjbxz"; + sha256 = "1ix5g1qnp7m0f8jk0bx0b5csx8p7zrxhnvkqc7jsyp9a3c4vnpky"; type = "gem"; }; - version = "1.177.0"; + version = "1.185.0"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -618,10 +632,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12djmxdbmbwk3r3ni8r73945plsr6wmw7yzw72gk42iq86ha0kn8"; + sha256 = "0j017xf6dzi5w5hfikjh138n91b5vkaxjm41dvqh86033knz643f"; type = "gem"; }; - version = "4.10.2"; + version = "4.10.3"; }; axe-core-rspec = { dependencies = [ @@ -634,10 +648,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xgp28gk45v25l6l1d4clm1gq7brcwh9nma51wbsl3p40xcbw0p3"; + sha256 = "0zjj06kwk57d3g18sfkam8r6fcrp2c3wj8m93l7ws3rd3q8x08fa"; type = "gem"; }; - version = "4.10.2"; + version = "4.10.3"; }; axiom-types = { dependencies = [ @@ -727,14 +741,16 @@ src: { groups = [ "default" "development" + "monorepo" + "test" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xwcnbwnbqq8jp92mvawn6y69cb53wsz84wwmk9vsfk1jjvqfw2z"; + sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg"; type = "gem"; }; - version = "0.2.0"; + version = "0.4.0"; }; benchmark-ips = { groups = [ @@ -919,20 +935,13 @@ src: { "development" "test" ]; - platforms = [ - { - engine = "maglev"; - } - { - engine = "ruby"; - } - ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0nx3yjf4xzdgb8jkmk2344081gqr22pgjqnmjg2q64mj5d6r9194"; + sha256 = "07hsr9zzl2mvf5gk65va4smdizlk9rsiz8wwxik0p96cj79518fl"; type = "gem"; }; - version = "11.1.3"; + version = "12.0.0"; }; capybara = { dependencies = [ @@ -1228,14 +1237,19 @@ src: { version = "1.2.3"; }; connection_pool = { - groups = [ "default" ]; + groups = [ + "default" + "development" + "monorepo" + "test" + ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3"; + sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg"; type = "gem"; }; - version = "2.5.0"; + version = "2.5.3"; }; console = { dependencies = [ @@ -1295,15 +1309,18 @@ src: { version = "4.0.1"; }; coverband = { - dependencies = [ "redis" ]; + dependencies = [ + "base64" + "redis" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1j0p1qsnnx0xhx43y7xskxwpcsv3yw5wj79qf7naf3nhdn73kkv5"; + sha256 = "09c21zxv7lsq5ih5rp214y38hcjm3pg5n3as1mqc2w0gn3lkn5s5"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.5"; }; crack = { dependencies = [ "safe_yaml" ]; @@ -1343,20 +1360,6 @@ src: { }; version = "0.5.0"; }; - crystalball = { - dependencies = [ "git" ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1why2py76hv2m7i3a1im3zi5zcjcvz2l1nvshzndlwah58vrywkf"; - type = "gem"; - }; - version = "0.7.0"; - }; css_parser = { dependencies = [ "addressable" ]; groups = [ @@ -1570,10 +1573,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1fh4d98irhph3ri7c2rrvvmmjd4z14702r8baq9flh5f34dap8d8"; + sha256 = "0k8j50avgs2pgv20wvrzr77g9yvhi5sa9yh93n72nyd4hhbd28cb"; type = "gem"; }; - version = "1.5.1"; + version = "2.2.3"; }; derailed_benchmarks = { dependencies = [ @@ -1623,10 +1626,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1zblvpxzb8qp17dn7sjnfqs6iw3yyzv2cwvnhzrzgxj8k0d0ddjs"; + sha256 = "1dcj3r8gh4y4cks1qk5qhj89ggk6z8kmk3hq9nlvnm9pnb7m9fbs"; type = "gem"; }; - version = "0.4.3"; + version = "0.4.4"; }; device_detector = { groups = [ "default" ]; @@ -1772,10 +1775,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0v6jjb1259y8dq97ibchc20jqjgk3z7zn12ggv5wzn2mcz1z6m3d"; + sha256 = "1lsh9lzrglqlwm9icmn0ggrwjc9iy9308f9m59z1w2srmyp0fgd7"; type = "gem"; }; - version = "5.8.1"; + version = "5.8.2"; }; doorkeeper-device_authorization_grant = { dependencies = [ "doorkeeper" ]; @@ -1931,28 +1934,15 @@ src: { }; version = "1.4.0"; }; - e2mmap = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0n8gxjb63dck3vrmsdcqqll7xs7f3wk78mw8w0gdk9wp5nx6pvj5"; - type = "gem"; - }; - version = "0.1.0"; - }; ed25519 = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0zb2dr2ihb1qiknn5iaj1ha1w9p7lj9yq5waasndlfadz225ajji"; + sha256 = "01n5rbyws1ijwc5dw7s88xx3zzacxx9k97qn8x11b6k8k18pzs8n"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; elasticsearch = { dependencies = [ @@ -2355,14 +2345,18 @@ src: { version = "1.0.1"; }; fast_gettext = { + dependencies = [ + "prime" + "racc" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "112gsrqah2w03kgi9mjsn6hl74mrwckphf223h36iayc4djf4lq2"; + sha256 = "0qr73k69pk5sjgkysrfar0sghrx0shz7kkfjcab200fnfqk62swf"; type = "gem"; }; - version = "2.3.0"; + version = "4.1.0"; }; ffaker = { groups = [ "default" ]; @@ -2384,10 +2378,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0fgwn1grxf4zxmyqmb9i4z2hr111585n9jnk17y6y7hhs7dv1xi6"; + sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9"; type = "gem"; }; - version = "1.17.1"; + version = "1.17.2"; }; ffi-compiler = { dependencies = [ @@ -2602,14 +2596,17 @@ src: { "fog-core" "nokogiri" ]; - groups = [ "default" ]; + groups = [ + "default" + "test" + ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "043lwdw2wsi6d55ifk0w3izi5l1d1h0alwyr3fixic7b94kc812n"; + sha256 = "1miv6zgglx4vddw2c17mpf6l36qn0abq7ngrxb9isih10yhzxfaj"; type = "gem"; }; - version = "0.1.3"; + version = "0.1.5"; }; formatador = { groups = [ "default" ]; @@ -2823,6 +2820,7 @@ src: { "activerecord" "activesupport" "addressable" + "bigdecimal" "concurrent-ruby" "faraday" "google-cloud-storage_transfer" @@ -2833,6 +2831,7 @@ src: { "jwt" "logger" "minitest" + "mutex_m" "parallel" "pg" "rack" @@ -2868,10 +2867,24 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0karz59rpw7vz4ckxc37gjs7lgb6zsa1pvsr57wzqfbpppgx5swa"; + sha256 = "1bshayyh9pb2rgb9qc82dc9fr1xkf4kxj10rd0lkjqxnbh7ppsxi"; type = "gem"; }; - version = "1.6.0"; + version = "1.12.0"; + }; + gitlab-crystalball = { + dependencies = [ "git" ]; + groups = [ + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "16mlrsd4lyvp9faqrnd7nmrl485wzrj2vp6y72x7f8wmsmqpivf4"; + type = "gem"; + }; + version = "0.7.2"; }; gitlab-dangerfiles = { dependencies = [ @@ -2887,10 +2900,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "007kxhbfi5kv7m4w9pvbrkfqwb8yp8shp8i77mj2l59qjqf35bdv"; + sha256 = "1cpiznkzlvsbanfcvnqdf0lxrzjd3i592d0j766xmr55mkc1jsr9"; type = "gem"; }; - version = "4.8.1"; + version = "4.9.1"; }; gitlab-duo-workflow-service-client = { dependencies = [ "grpc" ]; @@ -2942,10 +2955,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09mjdrgjyad1l2lcaiy62486hnajpv9mgyxcv6vrhga0dncqm6m1"; + sha256 = "0rh0bij1nk0c6agqg39p5qwhc93fdgriwqwnshgrkn66kwzs7ppk"; type = "gem"; }; - version = "0.0.29"; + version = "0.0.30"; }; gitlab-housekeeper = { dependencies = [ @@ -2988,10 +3001,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0n59m8jy9nl2adr27dgqbbrg8w9bwgjvg1jzinmwwhf7d4b0qj7x"; + sha256 = "075fasc3mv2l87l34cw5pw1vyf2ad254gsa9jpl4cqv3rx6hbfgj"; type = "gem"; }; - version = "17.9.1"; + version = "17.11.2"; }; gitlab-labkit = { dependencies = [ @@ -3050,14 +3063,15 @@ src: { version = "2.0.0"; }; gitlab-net-dns = { + dependencies = [ "logger" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0vkw1537wh37n57cygh7p2vb9fz4phbz2cg6njvq0545ihyn3d3k"; + sha256 = "19xmqvmv34gydymqv5m6aiync1xmycisqg4k0rrsglfllnqgnjmn"; type = "gem"; }; - version = "0.10.0"; + version = "0.12.0"; }; gitlab-rspec = { dependencies = [ @@ -3138,7 +3152,6 @@ src: { gitlab-secret_detection = { dependencies = [ "grpc" - "grpc-tools" "grpc_reflection" "parallel" "re2" @@ -3150,10 +3163,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1rv3r1wj5pnwjbkw3333y7kxj1hzzq0vnf6xdjj95n8m5b9krpck"; + sha256 = "1gip6bgsh6b284sjlz24ljydshsa9p5ikizwrmb82gnsc46dcsmk"; type = "gem"; }; - version = "0.23.0"; + version = "0.26.1"; }; gitlab-security_report_schemas = { dependencies = [ @@ -3279,10 +3292,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1c9wdinaf1z4qdynighcxxpkfarkizzh9slg2y77240mdsrgkyr9"; + sha256 = "05shhi6g3y8fp6h1accxzfi58py8d4rvv3bd17f1p6453pviirb8"; type = "gem"; }; - version = "2.8.0"; + version = "2.10.0"; }; globalid = { dependencies = [ "activesupport" ]; @@ -3654,10 +3667,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0g0h7rwiivx93jddfws5pdkcpnhma3694k2jfv2i1k80qkrqnrmv"; + sha256 = "1afriizkvwwcyh0s0j1x9d9045pn4f767gpj5q49hicsqz8flq58"; type = "gem"; }; - version = "3.25.6"; + version = "3.25.7"; }; googleapis-common-protos = { dependencies = [ @@ -3683,10 +3696,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "17smfrcmklx2f3ld6ai8l3vz9i8m96cj72zdyygnpy1iykf1j398"; + sha256 = "152nfvcnj1i1gsphhs7mhxzd0wa9pjdjb0xhgb2bry16ag57djxf"; type = "gem"; }; - version = "1.18.0"; + version = "1.19.0"; }; googleauth = { dependencies = [ @@ -3900,16 +3913,6 @@ src: { }; version = "1.5.0"; }; - grpc-tools = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "19r3ky3l593prhmk8ixdc4w1rbiyqzfw4dd0gk9ds1f38vhgrhyx"; - type = "gem"; - }; - version = "1.69.0"; - }; grpc_reflection = { dependencies = [ "grpc" ]; groups = [ "default" ]; @@ -4016,10 +4019,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08yn3z438hgh186iyvkqrhcy0fzzaky8j4h1hlbzzlfam49ckmx8"; + sha256 = "0qggmfrqx1f90xkkxn9afqk33bzx1vmj0gfdi6yvjj18d3p2w9p5"; type = "gem"; }; - version = "0.61.0"; + version = "0.62.0"; }; hamlit = { dependencies = [ @@ -4330,6 +4333,20 @@ src: { }; version = "2.1.0"; }; + io-console = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "18pgvl7lfjpichdfh1g50rpz0zpaqrpr52ybn9liv1v9pjn9ysnd"; + type = "gem"; + }; + version = "0.8.0"; + }; io-event = { groups = [ "default" ]; platforms = [ ]; @@ -4363,6 +4380,25 @@ src: { }; version = "0.4.8"; }; + irb = { + dependencies = [ + "pp" + "rdoc" + "reline" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1478m97wiy6nwg6lnl0szy39p46acsvrhax552vsh1s2mi2sgg6r"; + type = "gem"; + }; + version = "1.15.1"; + }; jaeger-client = { dependencies = [ "opentracing" @@ -4385,10 +4421,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "10fd3i92897blalxfkgc0jjv0qqx31v7cm7j2b6a3b97an0bfz80"; + sha256 = "09645h5an19zc1i7wlmixszj8xxqb2zc8qlf8dmx39bxpas1l24b"; type = "gem"; }; - version = "1.5.6"; + version = "1.6.0"; }; jira-ruby = { dependencies = [ @@ -4441,10 +4477,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l"; + sha256 = "1hfcz73wszgqprg2pr83qjbyfb0k93frbdvyhgmw0ryyl9cgc44s"; type = "gem"; }; - version = "2.10.2"; + version = "2.11.3"; }; json-jwt = { dependencies = [ @@ -4668,10 +4704,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hnx5s38myd0dgs7frm75ikvyl0g14pg1z7zjryp55j9p9dkrkab"; + sha256 = "09m8m65iyk8d1y0g52srl7994c80f8ai33z8flbzhsjqr2wy17rh"; type = "gem"; }; - version = "1.11.2"; + version = "1.11.5"; }; letter_opener = { dependencies = [ "launchy" ]; @@ -4747,10 +4783,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "16h8yhk4z2wk2lc0l0m7z2pbbk6mfljhy6hp11dx6lw8dp325q0b"; + sha256 = "0xyzk7gzi91l6xlwfvf2z0963jwd2csf987yk0ffbr5p9ycdp0ry"; type = "gem"; }; - version = "9.17.1"; + version = "9.18.0"; }; listen = { dependencies = [ @@ -5144,14 +5180,15 @@ src: { version = "3.0.27"; }; mixlib-log = { + dependencies = [ "ffi" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0n5dm5iz90ijvjn59jfm8gb8hgsvbj0f1kpzbl38b02z0z4a4v7x"; + sha256 = "0s57cq8qx3823pcfzizshp8vagvp3f87r0lksknj18r26nl3y79a"; type = "gem"; }; - version = "3.0.9"; + version = "3.2.3"; }; mixlib-shellout = { dependencies = [ "chef-utils" ]; @@ -5489,10 +5526,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0cgv8vzp7kl20ip8qdzmrbr1vaaw4mjjy4mksg8k13z4xxfzyqvb"; + sha256 = "0rb306hbky6cxfyc8vrwpvl40fdapjvhsk62h08gg9wwbn3n8x4c"; type = "gem"; }; - version = "1.18.7"; + version = "1.18.8"; }; notiffany = { dependencies = [ @@ -5549,6 +5586,19 @@ src: { }; version = "2.0.9"; }; + observer = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1b2h1642jy1xrgyakyzz6bkq43gwp8yvxrs8sww12rms65qi18yq"; + type = "gem"; + }; + version = "0.1.2"; + }; octokit = { dependencies = [ "faraday" @@ -6471,10 +6521,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1yd9kdyyg1wisxi9mx01ar9s6h50x9k2av95xam58v6jx6bwvg0d"; + sha256 = "1781qpj1mip1llq3jfbf0q7gk4mshar33afg6610qncb3gxz1fg9"; type = "gem"; }; - version = "15.1.0"; + version = "16.0.0"; }; parallel = { groups = [ @@ -6503,10 +6553,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "18dcwrcnddvi8gl3hmbsb2cj1l7afxk2lh3jmhj90l95h1hn3gkx"; + sha256 = "0i9w8msil4snx5w11ix9b0wf52vjc3r49khy3ddgl1xk890kcxi4"; type = "gem"; }; - version = "3.3.7.1"; + version = "3.3.8.0"; }; parslet = { groups = [ @@ -6537,6 +6587,16 @@ src: { }; version = "0.8.0"; }; + pdf-core = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14ffyc016pznyir87dcm2gyavwcppdyf87hyjhzixh3340g10p8a"; + type = "gem"; + }; + version = "0.10.0"; + }; peek = { dependencies = [ "railties" ]; groups = [ "default" ]; @@ -6592,6 +6652,52 @@ src: { }; version = "0.2.1"; }; + pp = { + dependencies = [ "prettyprint" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1zxnfxjni0r9l2x42fyq0sqpnaf5nakjbap8irgik4kg1h9c6zll"; + type = "gem"; + }; + version = "0.6.2"; + }; + prawn = { + dependencies = [ + "matrix" + "pdf-core" + "ttfunk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1diwqjchmymhj4ihp4xaad2mjc8q8bmibbbxwfd5pgrh9wxhxqpl"; + type = "gem"; + }; + version = "2.5.0"; + }; + prawn-svg = { + dependencies = [ + "css_parser" + "matrix" + "prawn" + "rexml" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0c18drdsms06h5c5hmhdi7sbck72f2sp3sbgwyr7frq65h1xs6r7"; + type = "gem"; + }; + version = "0.37.0"; + }; premailer = { dependencies = [ "addressable" @@ -6622,6 +6728,20 @@ src: { }; version = "1.12.0"; }; + prettyprint = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14zicq3plqi217w6xahv7b8f7aj5kpxv1j1w98344ix9h5ay3j9b"; + type = "gem"; + }; + version = "0.2.0"; + }; prime = { dependencies = [ "forwardable" @@ -6718,10 +6838,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1y41al94ks07166qbp2200yzyr5y60hm7xaiw4lxpgsm4b1pbyf8"; + sha256 = "0wpa3jd46h44rjz3hjwl5c0zfx3jav4a64nm8h0g1iwv61yvn2hb"; type = "gem"; }; - version = "3.10.1"; + version = "3.11.0"; }; pry-rails = { dependencies = [ "pry" ]; @@ -6755,6 +6875,24 @@ src: { }; version = "0.6.4"; }; + psych = { + dependencies = [ + "date" + "stringio" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4"; + type = "gem"; + }; + version = "5.2.3"; + }; public_suffix = { groups = [ "danger" @@ -6941,6 +7079,24 @@ src: { }; version = "0.7.0"; }; + rackup = { + dependencies = [ + "rack" + "webrick" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jf2ncj2nx56vh96hh2nh6h4r530nccxh87z7c2f37wq515611ms"; + type = "gem"; + }; + version = "1.0.1"; + }; rails = { dependencies = [ "actioncable" @@ -6964,10 +7120,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vfd2l3m1802vq7gdqpvd3mkcfhxacpsxixqpx4n6x0mv56ysrsy"; + sha256 = "0148c00v3hks98rymdiilhjm0i8qw5fla4gww0fb94k3ggns5bh5"; type = "gem"; }; - version = "7.0.8.7"; + version = "7.1.5.1"; }; rails-controller-testing = { dependencies = [ @@ -6987,20 +7143,22 @@ src: { rails-dom-testing = { dependencies = [ "activesupport" + "minitest" "nokogiri" ]; groups = [ "default" "development" + "monorepo" "test" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; + sha256 = "0fx9dx1ag0s1lr6lfr34lbx5i1bvn3bhyf3w3mx6h7yz90p725g5"; type = "gem"; }; - version = "2.0.3"; + version = "2.2.0"; }; rails-html-sanitizer = { dependencies = [ @@ -7039,7 +7197,8 @@ src: { dependencies = [ "actionpack" "activesupport" - "method_source" + "irb" + "rackup" "rake" "thor" "zeitwerk" @@ -7052,10 +7211,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0pshckc6b9h2ikl3svk47iv0nq6v908h3q9ndlblpg021cl8bf8s"; + sha256 = "1yz28fq55drl4c2dwgap96xcjf6qns2ghc3c3gffzm6yw9i5bq8b"; type = "gem"; }; - version = "7.0.8.7"; + version = "7.1.5.1"; }; rainbow = { groups = [ @@ -7178,6 +7337,21 @@ src: { }; version = "1.8.0"; }; + rdoc = { + dependencies = [ "psych" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0a83bsmd444pbhga3icwh8c7gm917m1fabq38dy1pn9ywjd17hij"; + type = "gem"; + }; + version = "6.13.0"; + }; re2 = { dependencies = [ "mini_portile2" ]; groups = [ "default" ]; @@ -7355,6 +7529,21 @@ src: { }; version = "1.0.0"; }; + reline = { + dependencies = [ "io-console" ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1lirwlw59apc8m1wjk85y2xidiv0fkxjn6f7p84yqmmyvish6qjp"; + type = "gem"; + }; + version = "0.6.0"; + }; representable = { dependencies = [ "declarative" @@ -7423,14 +7612,17 @@ src: { }; reverse_markdown = { dependencies = [ "nokogiri" ]; - groups = [ "default" ]; + groups = [ + "default" + "development" + ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0w786j869fjhjf72waj0hc9i4ghi45b78a2am27kij4sa2hmsc53"; + sha256 = "195c7yra7amggqj7rir0yr09r4v29c2hgkbkb21mj0jsfs3868mb"; type = "gem"; }; - version = "1.4.0"; + version = "3.0.0"; }; rexml = { groups = [ @@ -7901,10 +8093,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0j4zcp7nncrr6sn0m3scnqsxcf7j2v82pxcd7p3436m70ncmm1x1"; + sha256 = "17z0hi70s201gxw251hgv4r9zmfky2jlmp3pwma7hixsfpkx6gay"; type = "gem"; }; - version = "0.23.13"; + version = "0.23.15"; }; ruby-lsp-rails = { dependencies = [ "ruby-lsp" ]; @@ -8130,6 +8322,21 @@ src: { }; version = "0.1.1"; }; + securerandom = { + groups = [ + "default" + "development" + "monorepo" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc"; + type = "gem"; + }; + version = "0.4.1"; + }; seed-fu = { dependencies = [ "activerecord" @@ -8172,10 +8379,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "18vkhjy290kf6cvwq03whfih29wyl7q003kx4qa82x3cgh1pi2mv"; + sha256 = "07nx840hc07a1igzw7zbg1c3wp71sfflv7c6jivwxj7pcr9b0431"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.0"; }; sentry-rails = { dependencies = [ @@ -8186,10 +8393,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1drz5lm7s2m55pmxdbpbcxlpvgaj3rchm14nrzl2s80fvh47c8i3"; + sha256 = "1i6y53hkif95091m2pq07gx3l30f85fmkj6phblc2hz3hlybqb4d"; type = "gem"; }; - version = "5.22.1"; + version = "5.23.0"; }; sentry-ruby = { dependencies = [ @@ -8200,10 +8407,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "129jbd6zvfn59djs455hflk2nhf0sccnvp23vsiwd957dpbvsxzd"; + sha256 = "1k45ydlbl99c9ivbafzw8lpm9diiw4m7z55szi87l9kalpwv52wf"; type = "gem"; }; - version = "5.22.1"; + version = "5.23.0"; }; sentry-sidekiq = { dependencies = [ @@ -8214,10 +8421,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "129ahag27akxqha2dldvvzkbxi3zcrca9naifak3xqaqbs8kyymx"; + sha256 = "060wbm1xckmlnx3j8mlf7vgmxv6wsh75nq5smj2y2wspl89n9p1l"; type = "gem"; }; - version = "5.22.1"; + version = "5.23.0"; }; shellany = { groups = [ @@ -8472,25 +8679,40 @@ src: { "backport" "benchmark" "diff-lcs" - "e2mmap" "jaro_winkler" "kramdown" "kramdown-parser-gfm" + "logger" + "observer" + "ostruct" "parser" + "rbs" "reverse_markdown" "rubocop" "thor" "tilt" "yard" + "yard-solargraph" ]; groups = [ "development" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0smcpi3x87chkdqdclhgh36xlbwm7r44r58m3k1w4mcikdwlpjl7"; + sha256 = "0mkc1fxz4anv7fcq9jn26dc5ppwriand778f9dklzrpgq9pga8py"; type = "gem"; }; - version = "0.47.2"; + version = "0.54.2"; + }; + solargraph-rspec = { + dependencies = [ "solargraph" ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1kpsdfkj6yvd5ndhj5vbll4591lwg4gjrf5c61ffj8vvy4j93z0d"; + type = "gem"; + }; + version = "0.5.1"; }; sorbet-runtime = { groups = [ @@ -8654,6 +8876,35 @@ src: { }; version = "0.8.0"; }; + state_machines-rspec = { + dependencies = [ + "activesupport" + "rspec" + "state_machines" + ]; + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1gf0wlgkpdwwyxg810p1clpba6gmcl7jwvhlg5zwkl2pvx2pm99b"; + type = "gem"; + }; + version = "0.6.0"; + }; + stringio = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1yh78pg6lm28c3k0pfd2ipskii1fsraq46m6zjs5yc9a4k5vfy2v"; + type = "gem"; + }; + version = "3.1.7"; + }; strings = { dependencies = [ "strings-ansi" @@ -9063,6 +9314,17 @@ src: { }; version = "0.7.13"; }; + ttfunk = { + dependencies = [ "bigdecimal" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ji0kn8jkf1rpskv3ijzxvqwixg4p6sk8kg0vmwyjinci7jcgjx7"; + type = "gem"; + }; + version = "1.8.0"; + }; tty-color = { groups = [ "default" @@ -9475,10 +9737,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1i2ckb29ffjj431amnk0sr5h9vbs00139irs7bqh51jpl55lln74"; + sha256 = "0wj9ia0s7vywn66pf2jn49pfsy5h5rncjjwhaymwq32r3f2pq2p1"; type = "gem"; }; - version = "3.9.1"; + version = "3.9.2"; }; vmstat = { groups = [ "default" ]; @@ -9570,10 +9832,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3"; + sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl"; type = "gem"; }; - version = "1.8.2"; + version = "1.9.1"; }; websocket = { groups = [ @@ -9722,6 +9984,20 @@ src: { }; version = "0.9.37"; }; + yard-solargraph = { + dependencies = [ "yard" ]; + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03lklm47k6k294ww97x6zpvlqlyjm5q8jidrixhil622r4cld6m1"; + type = "gem"; + }; + version = "0.1.0"; + }; zeitwerk = { groups = [ "default" diff --git a/pkgs/by-name/gi/gitaly/git.nix b/pkgs/by-name/gi/gitaly/git.nix index 1390e56006fd..654c710d0da8 100644 --- a/pkgs/by-name/gi/gitaly/git.nix +++ b/pkgs/by-name/gi/gitaly/git.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "gitaly-git"; - version = "2.48.1.gl1"; + version = "2.49.0.gl2"; # `src` attribute for nix-update src = fetchFromGitLab { owner = "gitlab-org"; repo = "git"; rev = "v${version}"; - hash = "sha256-j7yKImeRerdsYtSMrAU4y5vAJ2BT5wnJxURbDIwVot4="; + hash = "sha256-1y94T5UBG7s76ENsUmaXRXngSKmqIAT0nq1u+QjSWaY="; }; # we actually use the gitaly build system diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix index af7a4f5e75d7..d3d637ac5c11 100644 --- a/pkgs/by-name/gi/gitaly/package.nix +++ b/pkgs/by-name/gi/gitaly/package.nix @@ -7,7 +7,7 @@ }: let - version = "17.11.2"; + version = "18.0.0"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -21,10 +21,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-Ihw3Mezfz9H19oGM7X9B50aUbyh1JjDOmVU5ZNoiWug="; + hash = "sha256-IhFKEBYCEORLPEplPDRdV61kY5ZgFAxJmfmoG9Q58ec="; }; - vendorHash = "sha256-ExqgxukFKXq/Z//hGSoDevfpJiNbVHhind63os1/3Fk="; + vendorHash = "sha256-PXONynRY5ZLQO2yQdtljDmLhVBIgfEYmyez9pIm9vtw="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix index e9d8b146af76..6398fe9c6adf 100644 --- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix +++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "gitlab-elasticsearch-indexer"; - version = "5.5.0"; + version = "5.5.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - hash = "sha256-b2kXp77pb9MXMRJsbDdNOXub8eZbZkHRwu/Ru0Voi60="; + hash = "sha256-N2H9jLpsP39nKrokWwphAspQwXcL3stAdvNVItIHFyo="; }; - vendorHash = "sha256-9T8LbMROLcQYm9cT32Uc6Cuxwt9OYj3WzSYFgSQg1HQ="; + vendorHash = "sha256-Go02W09799Vu9v7y+P7z1gj7ijG3No5AVprRrmspPZE="; buildInputs = [ icu ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix index 26f78662ec1a..e7c025c71124 100644 --- a/pkgs/by-name/gi/gitlab-pages/package.nix +++ b/pkgs/by-name/gi/gitlab-pages/package.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.11.2"; + version = "18.0.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-tnswEoocMZXBrS+5toV8IOVs8HcNrTG320ebQqB3XiQ="; + hash = "sha256-c2y11lMeHBi62Ql63HGolF454GkFp7UCErHGk5Bvgvw="; }; - vendorHash = "sha256-jCuLRXr7WHGxbXVg2JB1vp9WiNaLgsIJ6GJSS4QrlwY="; + vendorHash = "sha256-BjCwPt1duDINHP7L0qT2KNTjOZ62bWgVij88ztjjyPg="; subPackages = [ "." ]; meta = with lib; { From 4a1bbbba52df8734df447e840e68602c5745179a Mon Sep 17 00:00:00 2001 From: Yaya Date: Sun, 18 May 2025 14:16:07 +0200 Subject: [PATCH 70/92] gitlab: move to pkgs/by-name --- .../gi}/gitlab/Remove-unsupported-database-names.patch | 0 .../version-management => by-name/gi}/gitlab/data.json | 0 .../gi}/gitlab/gitlab-workhorse/default.nix | 0 .../gitlab/default.nix => by-name/gi/gitlab/package.nix} | 0 .../gi}/gitlab/remove-hardcoded-locations.patch | 0 .../gi}/gitlab/reset_token.rake | 0 .../version-management => by-name/gi}/gitlab/rubyEnv/Gemfile | 0 .../gi}/gitlab/rubyEnv/Gemfile.lock | 0 .../gi}/gitlab/rubyEnv/gemset.nix | 0 .../version-management => by-name/gi}/gitlab/update.py | 4 ++-- pkgs/top-level/all-packages.nix | 5 ++--- 11 files changed, 4 insertions(+), 5 deletions(-) rename pkgs/{applications/version-management => by-name/gi}/gitlab/Remove-unsupported-database-names.patch (100%) rename pkgs/{applications/version-management => by-name/gi}/gitlab/data.json (100%) rename pkgs/{applications/version-management => by-name/gi}/gitlab/gitlab-workhorse/default.nix (100%) rename pkgs/{applications/version-management/gitlab/default.nix => by-name/gi/gitlab/package.nix} (100%) rename pkgs/{applications/version-management => by-name/gi}/gitlab/remove-hardcoded-locations.patch (100%) rename pkgs/{applications/version-management => by-name/gi}/gitlab/reset_token.rake (100%) rename pkgs/{applications/version-management => by-name/gi}/gitlab/rubyEnv/Gemfile (100%) rename pkgs/{applications/version-management => by-name/gi}/gitlab/rubyEnv/Gemfile.lock (100%) rename pkgs/{applications/version-management => by-name/gi}/gitlab/rubyEnv/gemset.nix (100%) rename pkgs/{applications/version-management => by-name/gi}/gitlab/update.py (99%) diff --git a/pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch b/pkgs/by-name/gi/gitlab/Remove-unsupported-database-names.patch similarity index 100% rename from pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch rename to pkgs/by-name/gi/gitlab/Remove-unsupported-database-names.patch diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json similarity index 100% rename from pkgs/applications/version-management/gitlab/data.json rename to pkgs/by-name/gi/gitlab/data.json diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix similarity index 100% rename from pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix rename to pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/by-name/gi/gitlab/package.nix similarity index 100% rename from pkgs/applications/version-management/gitlab/default.nix rename to pkgs/by-name/gi/gitlab/package.nix diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/by-name/gi/gitlab/remove-hardcoded-locations.patch similarity index 100% rename from pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch rename to pkgs/by-name/gi/gitlab/remove-hardcoded-locations.patch diff --git a/pkgs/applications/version-management/gitlab/reset_token.rake b/pkgs/by-name/gi/gitlab/reset_token.rake similarity index 100% rename from pkgs/applications/version-management/gitlab/reset_token.rake rename to pkgs/by-name/gi/gitlab/reset_token.rake diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile similarity index 100% rename from pkgs/applications/version-management/gitlab/rubyEnv/Gemfile rename to pkgs/by-name/gi/gitlab/rubyEnv/Gemfile diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock similarity index 100% rename from pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock rename to pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix similarity index 100% rename from pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix rename to pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/by-name/gi/gitlab/update.py similarity index 99% rename from pkgs/applications/version-management/gitlab/update.py rename to pkgs/by-name/gi/gitlab/update.py index 1fd0cba1c643..0642e6140951 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/by-name/gi/gitlab/update.py @@ -242,7 +242,7 @@ def update_rubyenv(): subprocess.check_output(["rm", "-rf", "vendor", "gems"], cwd=rubyenv_dir) # Reformat gemset.nix - subprocess.check_output(["nix-shell", "--run", "treefmt pkgs/applications/version-management/gitlab"], cwd=NIXPKGS_PATH) + subprocess.check_output(["nix-shell", "--run", "treefmt pkgs/by-name/gi/gitlab"], cwd=NIXPKGS_PATH) @cli.command("update-gitaly") @@ -378,7 +378,7 @@ def commit_gitlab(old_version: str, new_version: str, new_rev: str) -> None: [ "git", "add", - "pkgs/applications/version-management/gitlab", + "pkgs/by-name/gi/gitlab", "pkgs/by-name/gi/gitaly", "pkgs/by-name/gi/gitlab-elasticsearch-indexer", "pkgs/by-name/gi/gitlab-pages", diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77c0304e4387..94c903666d21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3065,14 +3065,13 @@ with pkgs; gibberish-detector = with python3Packages; toPythonApplication gibberish-detector; - gitlab = callPackage ../applications/version-management/gitlab { }; - gitlab-ee = callPackage ../applications/version-management/gitlab { + gitlab-ee = callPackage ../by-name/gi/gitlab/package.nix { gitlabEnterprise = true; }; gitlab-triage = callPackage ../applications/version-management/gitlab-triage { }; - gitlab-workhorse = callPackage ../applications/version-management/gitlab/gitlab-workhorse { }; + gitlab-workhorse = callPackage ../by-name/gi/gitlab/gitlab-workhorse { }; gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { }; From ee58f11546a29307a3ced9715400187c7c4ca263 Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 20 May 2025 13:17:10 +0200 Subject: [PATCH 71/92] nixos/gitlab: update minimum PostgreSQL version assertion GitLab 18.0.0 requires at least PostgreSQL 16. https://docs.gitlab.com/18.0/install/requirements/#postgresql --- nixos/modules/services/misc/gitlab.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 646846c781ef..09dafdda600a 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1237,8 +1237,8 @@ in message = "services.gitlab.secrets.activeRecordSaltFile must be set!"; } { - assertion = versionAtLeast postgresqlPackage.version "14.9"; - message = "PostgreSQL >= 14.9 is required to run GitLab 17. Follow the instructions in the manual section for upgrading PostgreSQL here: https://nixos.org/manual/nixos/stable/index.html#module-services-postgres-upgrading"; + assertion = versionAtLeast postgresqlPackage.version "16"; + message = "PostgreSQL >= 16 is required to run GitLab 18. Follow the instructions in the manual section for upgrading PostgreSQL here: https://nixos.org/manual/nixos/stable/index.html#module-services-postgres-upgrading"; } ]; From c46cc8a67a9ef5964776d8ebaba80851e4fd14e7 Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 20 May 2025 13:26:40 +0200 Subject: [PATCH 72/92] nixos/doc/rl-2505: Mention minimal postgresql requirement for gitlab 18 `gitlab` >= 18.0 requires at least `postgresql` >= 16. GitLab users are advised to follow the mentioned steps in the manual to upgrade their PostgreSQL installation. --- nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index dbc62a4edb36..342db4ea6b46 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -348,6 +348,8 @@ Alongside many enhancements to NixOS modules and general system improvements, th - The behavior of the `networking.nat.externalIP` and `networking.nat.externalIPv6` options has been changed. `networking.nat.forwardPorts` now only forwards packets destined for the specified IP addresses. +- `gitlab` has been updated from 17.x to 18.x and requires `postgresql` >= 16, as stated in the [documentation](https://docs.gitlab.com/18.0/install/requirements/#postgresql). Check the [upgrade guide](#module-services-postgres-upgrading) in the NixOS manual on how to upgrade your PostgreSQL installation. + - `services.gitlab` now requires the setting of `activeRecordPrimaryKeyFile`, `activeRecordDeterministicKeyFile`, `activeRecordSaltFile` as GitLab introduced Rails ActiveRecord encryption. - `python3Packages.bpycv` has been removed due to being incompatible with Blender 4 and unmaintained. From 17d9682f6dfee5e5a9d560903a8264c626976811 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 11 May 2025 15:43:56 +0900 Subject: [PATCH 73/92] python3Packages.jupyter-collaboration: 3.1.0 -> 4.0.2 Changelog: https://github.com/jupyterlab/jupyter_collaboration/blob/v4.0.2/CHANGELOG.md --- .../python-modules/jupyter-collaboration/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-collaboration/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix index 49f2aeea1a78..3776a2d1f869 100644 --- a/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "jupyter-collaboration"; - version = "3.1.0"; + version = "4.0.2"; pyproject = true; src = fetchPypi { pname = "jupyter_collaboration"; inherit version; - hash = "sha256-BDmG5vzdikFh342XFqk92q/smidKqbUDWEx6gORh7p8="; + hash = "sha256-MXKFiuwO36TZGsLlemRUuy04JW/GCWMVdgRBIFTQuiE="; }; build-system = [ hatchling ]; From 2060c41118b0d5bcd025c0f00f708b3477ae835b Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 11 May 2025 15:46:52 +0900 Subject: [PATCH 74/92] python3Packages.jupyter-docprovider: 2.0.1 -> 2.0.2 --- .../python-modules/jupyter-docprovider/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-docprovider/default.nix b/pkgs/development/python-modules/jupyter-docprovider/default.nix index 2d92623c3761..dc94b0b85744 100644 --- a/pkgs/development/python-modules/jupyter-docprovider/default.nix +++ b/pkgs/development/python-modules/jupyter-docprovider/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "jupyter-docprovider"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; src = fetchPypi { pname = "jupyter_docprovider"; inherit version; - hash = "sha256-4pyF5HDQ7dP32R+O3QN8DWtvJpQxBBbjWXaRAfs10b4="; + hash = "sha256-vWgNlg6Ydw4va3DlEx3A/M9uE0t54GTrV1ljmlX44TU="; }; postPatch = '' From 85a5f2b6802b2de8f365c53feaeae5bfd033eceb Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 11 May 2025 16:36:09 +0900 Subject: [PATCH 75/92] python3Packages.jupyter-collaboration: build from source and fix tests --- .../jupyter-collaboration-ui/default.nix | 2 +- .../jupyter-collaboration/default.nix | 41 +++++++++++++++---- .../jupyter-collaboration/test.nix | 39 ------------------ .../jupyter-docprovider/default.nix | 2 +- .../jupyter-server-ydoc/default.nix | 2 +- 5 files changed, 35 insertions(+), 51 deletions(-) delete mode 100644 pkgs/development/python-modules/jupyter-collaboration/test.nix diff --git a/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix b/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix index 7c3b703a4d96..114962dada89 100644 --- a/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { # no tests doCheck = false; - passthru.tests = jupyter-collaboration.tests; + passthru.tests = jupyter-collaboration; meta = { description = "JupyterLab/Jupyter Notebook 7+ extension providing user interface integration for real time collaboration"; diff --git a/pkgs/development/python-modules/jupyter-collaboration/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix index 3776a2d1f869..dace73df26e3 100644 --- a/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, # build-system hatchling, @@ -10,9 +10,15 @@ jupyter-collaboration-ui, jupyter-docprovider, jupyter-server-ydoc, + jupyterlab, # tests - callPackage, + dirty-equals, + httpx-ws, + pytest-jupyter, + pytest-timeout, + pytestCheckHook, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { @@ -20,26 +26,43 @@ buildPythonPackage rec { version = "4.0.2"; pyproject = true; - src = fetchPypi { - pname = "jupyter_collaboration"; - inherit version; - hash = "sha256-MXKFiuwO36TZGsLlemRUuy04JW/GCWMVdgRBIFTQuiE="; + src = fetchFromGitHub { + owner = "jupyterlab"; + repo = "jupyter-collaboration"; + tag = "v${version}"; + hash = "sha256-BCvTtrlP45YC9G/m/e8Nvbls7AugIaQzO2Gect1EmGE="; }; + sourceRoot = "${src.name}/projects/jupyter-collaboration"; + build-system = [ hatchling ]; dependencies = [ jupyter-collaboration-ui jupyter-docprovider jupyter-server-ydoc + jupyterlab ]; pythonImportsCheck = [ "jupyter_collaboration" ]; - # no tests - doCheck = false; + nativeCheckInputs = [ + dirty-equals + httpx-ws + pytest-jupyter + pytest-timeout + pytestCheckHook + writableTmpDirAsHomeHook + ]; - passthru.tests = callPackage ./test.nix { }; + pytestFlagsArray = [ + # pytest.PytestCacheWarning: could not create cache path /build/source/.pytest_cache/v/cache/nodeids: [Errno 13] Permission denied: '/build/source/pytest-cache-files-plraagdr' + "-p" + "no:cacheprovider" + "$src/tests" + ]; + + __darwinAllowLocalNetworking = true; meta = { description = "JupyterLab Extension enabling Real-Time Collaboration"; diff --git a/pkgs/development/python-modules/jupyter-collaboration/test.nix b/pkgs/development/python-modules/jupyter-collaboration/test.nix deleted file mode 100644 index 044b923a723d..000000000000 --- a/pkgs/development/python-modules/jupyter-collaboration/test.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - stdenvNoCC, - fetchFromGitHub, - jupyter-collaboration, - pytest-jupyter, - pytestCheckHook, - websockets, -}: -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "jupyter-collaboration-test"; - inherit (jupyter-collaboration) version; - - src = fetchFromGitHub { - owner = "jupyterlab"; - repo = "jupyter-collaboration"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-6hDYB1uC0WraB37s9EKLJF7jyFu0B3xLocuLYyKj4hs="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "timeout = 300" "" - ''; - - installPhase = '' - touch $out - ''; - - env.HOME = "$TMPDIR"; - - doCheck = true; - - nativeCheckInputs = [ - jupyter-collaboration - pytest-jupyter - pytestCheckHook - websockets - ]; -}) diff --git a/pkgs/development/python-modules/jupyter-docprovider/default.nix b/pkgs/development/python-modules/jupyter-docprovider/default.nix index dc94b0b85744..834b1b63ebda 100644 --- a/pkgs/development/python-modules/jupyter-docprovider/default.nix +++ b/pkgs/development/python-modules/jupyter-docprovider/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { # no tests doCheck = false; - passthru.tests = jupyter-collaboration.tests; + passthru.tests = jupyter-collaboration; meta = { description = "JupyterLab/Jupyter Notebook 7+ extension integrating collaborative shared models"; diff --git a/pkgs/development/python-modules/jupyter-server-ydoc/default.nix b/pkgs/development/python-modules/jupyter-server-ydoc/default.nix index d8e823355b32..fdf1a4cd95b6 100644 --- a/pkgs/development/python-modules/jupyter-server-ydoc/default.nix +++ b/pkgs/development/python-modules/jupyter-server-ydoc/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { # no tests doCheck = false; - passthru.tests = jupyter-collaboration.tests; + passthru.tests = jupyter-collaboration; meta = { description = "Jupyter-server extension integrating collaborative shared models"; From 6ec497cb47435e6b265c56d1988ea43ceb4a01b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 14:41:59 +0000 Subject: [PATCH 76/92] tsukimi: 0.20.0 -> 0.21.0 --- pkgs/by-name/ts/tsukimi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ts/tsukimi/package.nix b/pkgs/by-name/ts/tsukimi/package.nix index 35b3452d5392..d55847f6bab5 100644 --- a/pkgs/by-name/ts/tsukimi/package.nix +++ b/pkgs/by-name/ts/tsukimi/package.nix @@ -22,18 +22,18 @@ }: stdenv.mkDerivation rec { pname = "tsukimi"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "tsukinaha"; repo = "tsukimi"; tag = "v${version}"; - hash = "sha256-OxRxl/+JP3eqxc5b0pb6QbAAHrZgHrq1cawas2UrUro="; + hash = "sha256-FmxNOMYHoQK//v4ZGvJ6vIHKYgMfQm7LTwQV9iEFo0A="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-kt3otu5N3KAzJT992v80Mbgr0sOoPnonc1+pu5ANIxE="; + hash = "sha256-iH7vCZhCN2/gu2EC+YG/LUL9N/HMMnj7qHqXUdrlAh8="; }; nativeBuildInputs = [ From deb960c1a136eb7fbbce37327f90d8c5fad6ebc3 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 20 May 2025 17:09:23 +0200 Subject: [PATCH 77/92] clash-verge-rev: fix .desktop name to fix service autostart option --- pkgs/by-name/cl/clash-verge-rev/unwrapped.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix index 0c289203e0db..97bac8b060f9 100644 --- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix +++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix @@ -93,4 +93,10 @@ rustPlatform.buildRustPackage { openssl webkitgtk_4_1 ]; + + # make sure the .desktop file name does not contain whitespace, + # so that the service can register it as an auto-start item + postInstall = '' + mv $out/share/applications/Clash\ Verge.desktop $out/share/applications/clash-verge.desktop + ''; } From a68ae13138cd460389ffe80461843d60ae5b500d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 15:41:23 +0000 Subject: [PATCH 78/92] ipfs-cluster: 1.1.3 -> 1.1.4 --- pkgs/by-name/ip/ipfs-cluster/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ip/ipfs-cluster/package.nix b/pkgs/by-name/ip/ipfs-cluster/package.nix index 8c176a4dac41..4426f45327f3 100644 --- a/pkgs/by-name/ip/ipfs-cluster/package.nix +++ b/pkgs/by-name/ip/ipfs-cluster/package.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "1.1.3"; + version = "1.1.4"; vendorHash = "sha256-VVejr6B7eDNNQF34PS/PaQ50mBNZgzJS50aNzbLJgCg="; @@ -14,7 +14,7 @@ buildGoModule rec { owner = "ipfs-cluster"; repo = "ipfs-cluster"; rev = "v${version}"; - hash = "sha256-C3bBtZsDcYy6I0wmaYIDwhmGJVNcWq+rCdi5WHUzvB8="; + hash = "sha256-mdLrLiRNudpQ8i0lvwoNAqhSWJ8VMEC1ZRxXHWHpqLY="; }; meta = with lib; { From 7dad80a62649ac5c9b470dc822db7f1a8a93fabc Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 20 May 2025 18:31:35 +0200 Subject: [PATCH 79/92] openvpn3: 24 -> 24.1 Fixes CVE-2025-3908. https://github.com/OpenVPN/openvpn3-linux/releases/tag/v24.1 --- pkgs/by-name/op/openvpn3/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openvpn3/package.nix b/pkgs/by-name/op/openvpn3/package.nix index c690a37a1da8..cf25ba7abce8 100644 --- a/pkgs/by-name/op/openvpn3/package.nix +++ b/pkgs/by-name/op/openvpn3/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "openvpn3"; # also update openvpn3-core - version = "24"; + version = "24.1"; src = fetchFromGitHub { owner = "OpenVPN"; repo = "openvpn3-linux"; tag = "v${version}"; - hash = "sha256-e3NRLrznTEolTzMO+kGEh48MCrcEr8p7JG3hG889aK4="; + hash = "sha256-E6SBVPHmejXB18RuNCNq62yWOJslZfIjVbNUdRIk5Sw="; # `openvpn3-core` is a submodule. # TODO: make it into a separate package fetchSubmodules = true; From 8621bc52f13d069da83133d0bc34fbc0fe943ed6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 19 May 2025 00:45:02 +0200 Subject: [PATCH 80/92] python312Packages.apache-beam: 2.63.0 -> 2.65.0 Diff: https://github.com/apache/beam/compare/refs/tags/v2.63.0...refs/tags/v2.65.0 Changelog: https://github.com/apache/beam/blob/release-2.65.0/CHANGES.md --- pkgs/development/python-modules/apache-beam/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 3bcf99a4abf5..bcf7f40062c8 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -17,7 +17,6 @@ yapf, # dependencies - cloudpickle, crcmod, dill, fastavro, @@ -63,14 +62,14 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.63.0"; + version = "2.65.0"; pyproject = true; src = fetchFromGitHub { owner = "apache"; repo = "beam"; tag = "v${version}"; - hash = "sha256-ixJstawgU3UGtNKVzkwMCLkdY7QKTbxNe6JJ7vG+vmA="; + hash = "sha256-vDW0PVNep+egIZBe4t8IPwLgsQDmoO4rrA4wUoAHzfg="; }; pythonRelaxDeps = [ @@ -109,7 +108,6 @@ buildPythonPackage rec { ]; dependencies = [ - cloudpickle crcmod dill fastavro From 890d1a5e6fe6cdb848f8c5734bd5a9b590530406 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 20 May 2025 18:57:18 +0200 Subject: [PATCH 81/92] python312Packages.tensorflow-datasets: skip failing test https://github.com/tensorflow/datasets/issues/11055 --- .../python-modules/tensorflow-datasets/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index 625619e9bd0a..95d2fa35cc90 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -136,6 +136,13 @@ buildPythonPackage rec { "--deselect=tensorflow_datasets/text/c4_wsrs/c4_wsrs_test.py::C4WSRSTest" ]; + disabledTests = [ + # Since updating apache-beam to 2.65.0 + # RuntimeError: Unable to pickle fn CallableWrapperDoFn...: maximum recursion depth exceeded + # https://github.com/tensorflow/datasets/issues/11055 + "test_download_and_prepare_as_dataset" + ]; + disabledTestPaths = [ # Sandbox violations: network access, filesystem write attempts outside of build dir, ... "tensorflow_datasets/core/dataset_builder_test.py" From 16942250db79352e1233ad22eb146d7af19b802c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 20 May 2025 19:18:00 +0200 Subject: [PATCH 82/92] python312Packages.tensorflow-datasets: add missing test dependency (cloudpickle) --- pkgs/development/python-modules/tensorflow-datasets/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index 95d2fa35cc90..728e669aae08 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -26,6 +26,7 @@ apache-beam, beautifulsoup4, click, + cloudpickle, datasets, ffmpeg, imagemagick, @@ -101,6 +102,7 @@ buildPythonPackage rec { apache-beam beautifulsoup4 click + cloudpickle datasets ffmpeg imagemagick From cc8c6c8ec5f077d717d11ad8740ed44e8a2d0d3d Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Tue, 20 May 2025 17:56:36 +0000 Subject: [PATCH 83/92] =?UTF-8?q?vector:=200.46.1=20=E2=86=92=200.47.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/ve/vector/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix index 9692f6ed11d9..3dccadda95dd 100644 --- a/pkgs/by-name/ve/vector/package.nix +++ b/pkgs/by-name/ve/vector/package.nix @@ -25,7 +25,7 @@ let pname = "vector"; - version = "0.46.1"; + version = "0.47.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -34,11 +34,10 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-ouPCBaG/wwjIyzXA5PgBRpAtOJ5IuOrS+k4p6/KRzzY="; + hash = "sha256-09CjhSckptXbbTzBneo5aQ76YwLPSacRlsMpexsw54c="; }; - useFetchCargoVendor = true; - cargoHash = "sha256-Bl/dgkoF9Hx1hLt9+kZiyK42GNr+5UGJYy5QZOnHDV4="; + cargoHash = "sha256-9cCqdi65C4JCMP743nhrNmBlJsIFiNPGguyVEEJpGww="; nativeBuildInputs = [ From 9af27f1cb5bc2a33c37846f2d5985989079fbe18 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 20 May 2025 01:39:56 +0200 Subject: [PATCH 84/92] nixos/orca: Make available to gdm greeter Without this, the greeter is unable to see `orca` program on `PATH` and so `${gdm}/share/gdm/greeter/autostart/orca-autostart.desktop` will fail to start it. As a result, screen reader would not work on the login screen. --- nixos/modules/services/accessibility/orca.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/accessibility/orca.nix b/nixos/modules/services/accessibility/orca.nix index 4487afba103c..e624ffa23a33 100644 --- a/nixos/modules/services/accessibility/orca.nix +++ b/nixos/modules/services/accessibility/orca.nix @@ -20,6 +20,7 @@ in config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; + systemd.services.display-manager.path = [ cfg.package ]; services.speechd.enable = true; }; } From 32f16bfe4bad50305b39321671c44282d584a3d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 21 May 2025 04:39:10 +1000 Subject: [PATCH 85/92] melonDS: 1.0rc-unstable-2025-04-09 -> 1.0rc-unstable-2025-05-15 (#408484) --- pkgs/by-name/me/melonDS/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 096e3ad8d8f4..d7d1d0e7ee07 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "1.0rc-unstable-2025-04-09"; + version = "1.0rc-unstable-2025-05-15"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "9ed7e5803e55c5eeb29ec560c8659b38ed331749"; - hash = "sha256-wLCaGnaMYaPjFzYTph16WTdE89j4MFaO4FuIQdH9R80="; + rev = "0e64a06c84f9b9428f8647c2aafde110c9d917f3"; + hash = "sha256-T+AcpAITNALtZbuwY+oh4RnMgjCAi7n2HPyDjFqpQPI="; }; nativeBuildInputs = [ From 90d767a7a475613b0f3ebb8c95ae113ff3fcf637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Mon, 19 May 2025 13:29:29 +0700 Subject: [PATCH 86/92] =?UTF-8?q?h2o:=202.3.0.20250430=20=E2=86=92=202.3.0?= =?UTF-8?q?.20250519?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/h2/h2o/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index b3a90cdb830f..f1a10981f88f 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0.20250430"; + version = "2.3.0.20250519"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "f1918a5b9f75f4da9db801b442886cb13b3c7bcd"; - sha256 = "sha256-sfOkyEhlLGmXjYqRoI/8pD6/NBY7q6K9y2vS7qwJmrw="; + rev = "87e2aa634f2c0d9f3d9429f7a3cf273f98db0058"; + sha256 = "sha256-/9YnaOqvYmFme4/mFq8Sx78FMDyGwnErEW45qPVELjU="; }; outputs = [ From aec24ad1f55dbf0ad0174291439414fff91d2bbb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 19:34:12 +0000 Subject: [PATCH 87/92] ytdownloader: 3.19.0 -> 3.19.1 --- pkgs/by-name/yt/ytdownloader/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/yt/ytdownloader/package.nix b/pkgs/by-name/yt/ytdownloader/package.nix index b5dc05ec9e45..77ed78c2496b 100644 --- a/pkgs/by-name/yt/ytdownloader/package.nix +++ b/pkgs/by-name/yt/ytdownloader/package.nix @@ -12,16 +12,16 @@ buildNpmPackage rec { pname = "ytDownloader"; - version = "3.19.0"; + version = "3.19.1"; src = fetchFromGitHub { owner = "aandrew-me"; repo = "ytDownloader"; tag = "v${version}"; - hash = "sha256-Oj462x1oyhaLFbVNr90hKmg0S+BZXUv1DyNdxsc2L7Y="; + hash = "sha256-EweQgKA0CNgiO7q+WTLsUJHpiuRJBQox2FEgjh6CHDQ="; }; - npmDepsHash = "sha256-ZJdPfNndYOWzvJpgra16/tCuWTvPLd4ZhSFualJB00E="; + npmDepsHash = "sha256-moOxzvzBFNqEe2xd2jVyotxaSsIi+F7J6Dwvqp2Bs08="; nativeBuildInputs = [ copyDesktopItems From 9584954d4c07e3f481b9b60bd7a76c5cc38c6c0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 19:43:18 +0000 Subject: [PATCH 88/92] ord: 0.23.1 -> 0.23.2 --- pkgs/by-name/or/ord/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/or/ord/package.nix b/pkgs/by-name/or/ord/package.nix index 29f9deb8bca1..34050f3e23bc 100644 --- a/pkgs/by-name/or/ord/package.nix +++ b/pkgs/by-name/or/ord/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "ord"; - version = "0.23.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "ordinals"; repo = "ord"; rev = version; - hash = "sha256-jYu9NPvs7nwgiqMCvZlLQqoYESwjKAYlhJ9ehev70EY="; + hash = "sha256-p9WjZ8QsY5fvL91zPUKnK8p0ZJvAxzmPbN/UVWSNjqk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-U5bGNgiy98PK2Le5BbzCOAajeEKb/zYTIID1uOE6p3c="; + cargoHash = "sha256-c3+yM7jJyIl2XpSOeqdeQP2OdRc7/t/epDTMoOa/66A="; nativeBuildInputs = [ pkg-config From 98a8834d7a5b1985bac0be34e5ca2b4b4db9604e Mon Sep 17 00:00:00 2001 From: emaryn Date: Wed, 21 May 2025 03:08:09 +0800 Subject: [PATCH 89/92] organicmaps: 2025.03.02-7 -> 2025.05.20-5 Diff: https://github.com/organicmaps/organicmaps/compare/refs/tags/2025.03.02-7-android...refs/tags/2025.05.20-5-android --- pkgs/applications/misc/organicmaps/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index f166e404ebe2..51109c49051c 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -19,6 +19,7 @@ icu, freetype, pugixml, + xorg, nix-update-script, }: @@ -32,13 +33,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "organicmaps"; - version = "2025.03.02-7"; + version = "2025.05.20-5"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; tag = "${finalAttrs.version}-android"; - hash = "sha256-5WX+YDgu8Ll5+rZWWxfbNW0pBFz+2XWkw/ahM14Ml08="; + hash = "sha256-cqcFI5cXREOeHusPkXsMwdCopzpea50mZQ/+ogLlemk="; fetchSubmodules = true; }; @@ -78,6 +79,9 @@ stdenv.mkDerivation (finalAttrs: { icu freetype pugixml + xorg.libXrandr + xorg.libXinerama + xorg.libXcursor ]; # Yes, this is PRE configure. The configure phase uses cmake @@ -94,14 +98,14 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { # darwin: "invalid application of 'sizeof' to a function type" broken = stdenv.hostPlatform.isDarwin; homepage = "https://organicmaps.app/"; description = "Detailed Offline Maps for Travellers, Tourists, Hikers and Cyclists"; - license = licenses.asl20; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.all; mainProgram = "OMaps"; }; }) From a6503ee2dfc7548382936f64b91b91b9d3b75170 Mon Sep 17 00:00:00 2001 From: Sam Estep Date: Tue, 20 May 2025 16:07:11 -0400 Subject: [PATCH 90/92] jai: 0.2.011 -> 0.2.012 --- pkgs/by-name/ja/jai/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ja/jai/package.nix b/pkgs/by-name/ja/jai/package.nix index cd255c330a8d..17dabf41a899 100644 --- a/pkgs/by-name/ja/jai/package.nix +++ b/pkgs/by-name/ja/jai/package.nix @@ -9,7 +9,7 @@ let pname = "jai"; minor = "2"; - patch = "011"; + patch = "012"; version = "0.${minor}.${patch}"; zipName = "jai-beta-${minor}-${patch}.zip"; jai = stdenv.mkDerivation { @@ -20,7 +20,7 @@ let nix-store --add-fixed sha256 ${zipName} ''; name = zipName; - sha256 = "sha256-Du4rTA2g7hjlsUA/hvPY6O6L34e/MmnUN8rzi1jF/dY"; + sha256 = "sha256-1cUEQ+C3qwo3v4E2ioH2NcIH864Cay2dxQT+Yo/fZJ8="; }; nativeBuildInputs = [ unzip ]; buildCommand = "unzip $src -d $out"; From f243ea59d9e4711a90df773f6e4da1ff49bc02a4 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Tue, 20 May 2025 20:32:16 +0000 Subject: [PATCH 91/92] nixos/vector: Update dnstap test to start network service --- nixos/tests/vector/dnstap.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/vector/dnstap.nix b/nixos/tests/vector/dnstap.nix index 935ea757e107..ec20ce1f6a1d 100644 --- a/nixos/tests/vector/dnstap.nix +++ b/nixos/tests/vector/dnstap.nix @@ -114,6 +114,7 @@ import ../make-test-python.nix ( unbound.wait_for_file("${dnstapSocket}") unbound.succeed("test 770 -eq $(stat -c '%a' ${dnstapSocket})") + dnsclient.systemctl("start network-online.target") dnsclient.wait_for_unit("network-online.target") dnsclient.succeed( "dig @unbound test.local" From eb394bfc0a6b28c8f187788f77471b09cde687dc Mon Sep 17 00:00:00 2001 From: Marius Kleidl <1375043+Acconut@users.noreply.github.com> Date: Tue, 20 May 2025 22:40:16 +0200 Subject: [PATCH 92/92] tusd: embed version in binary (#409019) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * nixosTests.tusd: Fix network race condition Fixes error: client # curl: (7) Failed to connect to server port 1080 after 8 ms: Could not connect to server client # [ 5.621267] network-addresses-eth1-start[795]: adding address 192.168.1.1/24... done * tusd: embed version in binary Currently, tusd reports 'n/a' when its version is queried using `tusd -version`. This change embeds the current version during the build process, so it correctly reports the value. See https://github.com/tus/tusd/blob/8e66333a019e500eb1c5a0b9843342606382ef5e/scripts/build_funcs.sh#L20 --------- Co-authored-by: Niklas Hambüchen --- nixos/tests/tusd/default.nix | 1 + pkgs/by-name/tu/tusd/package.nix | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/nixos/tests/tusd/default.nix b/nixos/tests/tusd/default.nix index 3ef7544dd22f..ec188dee56ca 100644 --- a/nixos/tests/tusd/default.nix +++ b/nixos/tests/tusd/default.nix @@ -43,6 +43,7 @@ in client.succeed("${pkgs.coreutils}/bin/truncate --size=100M file-100M.bin") # Upload it. + client.wait_for_unit("network.target") client.succeed("${./tus-curl-upload.sh} file-100M.bin http://server:${toString port}/files/") print("Upload succeeded") diff --git a/pkgs/by-name/tu/tusd/package.nix b/pkgs/by-name/tu/tusd/package.nix index 5cc36513d403..2e0febe8adaf 100644 --- a/pkgs/by-name/tu/tusd/package.nix +++ b/pkgs/by-name/tu/tusd/package.nix @@ -18,6 +18,10 @@ buildGoModule rec { vendorHash = "sha256-YununGyB72zE0tmqO3BREJeMTjCuy/1fhPHC5r8OLjg="; + ldflags = [ + "-X github.com/tus/tusd/v2/cmd/tusd/cli.VersionName=v${version}" + ]; + # Tests need the path to the binary: # https://github.com/tus/tusd/blob/0e52ad650abed02ec961353bb0c3c8bc36650d2c/internal/e2e/e2e_test.go#L37 preCheck = ''