From 09de72aad036c5b9fb1cca78642cbe04531ea9d8 Mon Sep 17 00:00:00 2001 From: Philip Wilk Date: Sun, 23 Mar 2025 16:43:59 +0000 Subject: [PATCH 001/272] 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 002/272] 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 003/272] 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 004/272] 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 ab792bb54035c631d2f1a3001d3b2d6de5fb076b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Apr 2025 04:56:39 +0000 Subject: [PATCH 005/272] libcerf: 2.4 -> 3.0 --- pkgs/by-name/li/libcerf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libcerf/package.nix b/pkgs/by-name/li/libcerf/package.nix index cd02eee33e70..4e34cc1a1a6a 100644 --- a/pkgs/by-name/li/libcerf/package.nix +++ b/pkgs/by-name/li/libcerf/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libcerf"; - version = "2.4"; + version = "3.0"; src = fetchurl { url = "https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${version}/libcerf-v${version}.tar.gz"; - sha256 = "sha256-CAswrlZMPavjuJJkUira9WR+x1QCFXK+5UkpaXsnbNw="; + sha256 = "sha256-xhCPvaia839YgRnAxUK2wegkhFo2vqL6MfftLMGiRts="; }; nativeBuildInputs = [ From e0705250d2b9b192aa0ee430d61e4039c91d1f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Thu, 5 Dec 2024 19:10:39 +0100 Subject: [PATCH 006/272] buildNodePackage: enable strictDeps --- pkgs/development/node-packages/node-env.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 4154ce72634c..f5a9db742566 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -540,16 +540,17 @@ let in stdenv.mkDerivation ( { - name = "${name}${if version == null then "" else "-${version}"}"; + name = name + lib.optionalString (version != null) "-${version}"; + strictDeps = true; buildInputs = - [ - tarWrapper - python - nodejs - ] + [ tarWrapper ] ++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool ++ buildInputs; + propagatedNativeBuildInputs = [ + nodejs + python + ]; inherit nodejs; From d3b50e56b7ee15285add46c0fcd14654b87fe781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Sun, 8 Dec 2024 20:16:53 +0100 Subject: [PATCH 007/272] homepage-dashboard: unbreak Darwin --- pkgs/by-name/ho/homepage-dashboard/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ho/homepage-dashboard/package.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix index f9f55510bfff..1601b79052ad 100644 --- a/pkgs/by-name/ho/homepage-dashboard/package.nix +++ b/pkgs/by-name/ho/homepage-dashboard/package.nix @@ -112,6 +112,5 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ jnsgruk ]; platforms = lib.platforms.all; - broken = stdenv.hostPlatform.isDarwin; }; }) From f1cbb85ee1eb99f100d90f1c8a1ac467452080e4 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Mon, 28 Apr 2025 19:41:37 +0200 Subject: [PATCH 008/272] 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 009/272] 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 010/272] 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 011/272] 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 012/272] 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 013/272] 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 f5efa59ad1e3ea384637bd3f3a9472a8ad0cea75 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Mon, 5 May 2025 11:58:39 +0200 Subject: [PATCH 014/272] nixos/k3s: support fetching helm charts from OCI registries This enables fetching Helm charts from OCI-based registries. OCI charts will be detected by checking that the repo has a `oci://` prefix, the behaviour for regular chart registries remains the same. The `name` field can be omitted for OCI charts. --- .../modules/services/cluster/k3s/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index fe73c178d491..22e3534ea591 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -46,8 +46,12 @@ let ) ); - # Replace characters that are problematic in file names + # Replace prefixes and characters that are problematic in file names cleanHelmChartName = + name: + let + woPrefix = lib.removePrefix "https://" (lib.removePrefix "oci://" name); + in lib.replaceStrings [ "/" @@ -56,7 +60,8 @@ let [ "-" "-" - ]; + ] + woPrefix; # Fetch a Helm chart from a public registry. This only supports a basic Helm pull. fetchHelm = @@ -66,7 +71,12 @@ let version, hash ? lib.fakeHash, }: - pkgs.runCommand (cleanHelmChartName "${lib.removePrefix "https://" repo}-${name}-${version}.tgz") + let + isOci = lib.hasPrefix "oci://" repo; + pullCmd = if isOci then repo else "--repo ${repo} ${name}"; + name' = if isOci then "${repo}-${version}" else "${repo}-${name}-${version}"; + in + pkgs.runCommand (cleanHelmChartName "${name'}.tgz") { inherit (lib.fetchers.normalizeHash { } { inherit hash; }) outputHash outputHashAlgo; impureEnvVars = lib.fetchers.proxyImpureEnvVars; @@ -76,9 +86,7 @@ let ]; } '' - export HOME="$PWD" - helm repo add repository ${repo} - helm pull repository/${name} --version ${version} + helm pull ${pullCmd} --version ${version} mv ./*.tgz $out ''; @@ -724,7 +732,11 @@ in }; }; }; - + nginx = { + repo = "oci://registry-1.docker.io/bitnamicharts/nginx"; + version = "20.0.0"; + hash = "sha256-sy+tzB+i9jIl/tqOMzzuhVhTU4EZVsoSBtPznxF/36c="; + }; custom-chart = { package = ../charts/my-chart.tgz; values = ../values/my-values.yaml; From fb1e22f57681298627f65eb43a3a4deea96bdbd5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 May 2025 12:58:04 +0000 Subject: [PATCH 015/272] armadillo: 14.4.1 -> 14.4.2 --- pkgs/by-name/ar/armadillo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/armadillo/package.nix b/pkgs/by-name/ar/armadillo/package.nix index c7edb0135324..76fd8c93cf3a 100644 --- a/pkgs/by-name/ar/armadillo/package.nix +++ b/pkgs/by-name/ar/armadillo/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "14.4.1"; + version = "14.4.2"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-Js4nK/3IJGwnjm+M+lN3eh77FO8ZbogIL+4F2hpGNJE="; + hash = "sha256-bf3c+9kecGedfBHpSlljp+/aAC/sNR5vSHWsjiRcURc="; }; nativeBuildInputs = [ cmake ]; From d7a7425974c1bef0fded090be6ca8e4aeba13f1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 07:41:31 +0000 Subject: [PATCH 016/272] libpulsar: 3.7.0 -> 3.7.1 --- pkgs/development/libraries/libpulsar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/development/libraries/libpulsar/default.nix index c255ee432d0e..e3952caea88b 100644 --- a/pkgs/development/libraries/libpulsar/default.nix +++ b/pkgs/development/libraries/libpulsar/default.nix @@ -48,13 +48,13 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "libpulsar"; - version = "3.7.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "apache"; repo = "pulsar-client-cpp"; rev = "v${version}"; - hash = "sha256-hY6ivTKWgl/2KLeP6MMAdWcM/LJ5b7zoNVRlg6nx6Sc="; + hash = "sha256-RHWi0KCq7U7Dr3Ic7kduc8P64VpAThTQ3lDxLLEqzIU="; }; nativeBuildInputs = From d1722bc9c829dce4a1ee96add25109e3dc3c3fb7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 11:48:35 +0000 Subject: [PATCH 017/272] octavePackages.io: 2.6.4 -> 2.7.0 --- pkgs/development/octave-modules/io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/octave-modules/io/default.nix b/pkgs/development/octave-modules/io/default.nix index f5f99b8b108f..989b78ad875f 100644 --- a/pkgs/development/octave-modules/io/default.nix +++ b/pkgs/development/octave-modules/io/default.nix @@ -9,11 +9,11 @@ buildOctavePackage rec { pname = "io"; - version = "2.6.4"; + version = "2.7.0"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-p0pAC70ZIn9sB8WFiS3oec165S2CDaH2nxo+PolFL1o="; + sha256 = "sha256-SqSEaLNpeTS/jIVOJ9uriCdgXp3U/jflaDQmXmEwum8="; }; buildInputs = [ From aef67089a7374c3d55b32e42c96e4abdef940191 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 18:11:54 +0000 Subject: [PATCH 018/272] renderdoc: 1.37 -> 1.38 --- pkgs/by-name/re/renderdoc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix index f4b20fb253c9..dba59f5d201a 100644 --- a/pkgs/by-name/re/renderdoc/package.nix +++ b/pkgs/by-name/re/renderdoc/package.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "renderdoc"; - version = "1.37"; + version = "1.38"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${finalAttrs.version}"; - hash = "sha256-udi3v5DyJ9aDBsfTv+T9VTa7SyhNAyuNB3LF5G8vZVg="; + hash = "sha256-6DvBV2amPfQff3LleXaqfoKzWvoHUJ0dh/bg/WcGIeA="; }; outputs = [ From cd3045ca0c964cacece802b787ad9b2080adc1da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 19:26:35 +0000 Subject: [PATCH 019/272] sonata: 1.7.0 -> 1.7.1 --- pkgs/by-name/so/sonata/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/sonata/package.nix b/pkgs/by-name/so/sonata/package.nix index 2311c8d3ba13..477b04a7da6b 100644 --- a/pkgs/by-name/so/sonata/package.nix +++ b/pkgs/by-name/so/sonata/package.nix @@ -24,13 +24,13 @@ let in buildPythonApplication rec { pname = "sonata"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "multani"; repo = "sonata"; - rev = "v${version}"; - sha256 = "0rl8w7s2asff626clzfvyz987l2k4ml5dg417mqp9v8a962q0v2x"; + tag = "v${version}"; + sha256 = "sha256-80F2dVaRawnI0E+GzaxRUudaLWWHGUjICCEbXHVGy+E="; }; disabled = !isPy3k; From bf21f9843ae9beb07e4298ad706d7503422cffde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 21:47:48 +0000 Subject: [PATCH 020/272] renode-unstable: 1.15.3+20250406gitea53e3840 -> 1.15.3+20250507git91a4bb342 --- pkgs/by-name/re/renode-unstable/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index e90d7b637e59..4f3dbc2f2dff 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -7,11 +7,11 @@ renode.overrideAttrs ( finalAttrs: _: { pname = "renode-unstable"; - version = "1.15.3+20250406gitea53e3840"; + version = "1.15.3+20250507git91a4bb342"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz"; - hash = "sha256-bhuhMSogZUuUQrSVw9MAt8L89OoT67QRuZ9AG2ZTAKI="; + hash = "sha256-x0g7wsaDCi3QUTEQcw/gGtzkWTmJB7ZZVqCE9fOyCFI="; }; passthru.updateScript = From 47adab9257aee0c871f99f4aa9bfc7d962c0c197 Mon Sep 17 00:00:00 2001 From: Mattias Cockburn Date: Thu, 8 May 2025 00:09:48 +0200 Subject: [PATCH 021/272] 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 022/272] 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 856bddbe8e07c28ef84bb183f13a7c3a328fc947 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 May 2025 03:53:25 +0000 Subject: [PATCH 023/272] vivaldi: 7.3.3635.11 -> 7.3.3635.12 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index ecefca97eb3a..c3c47fdda6f8 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -71,7 +71,7 @@ let in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "7.3.3635.11"; + version = "7.3.3635.12"; suffix = { @@ -84,8 +84,8 @@ stdenv.mkDerivation rec { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-w1/wWP3lZUQ5tBvv6XOCkoR1OCoByURBEvaaemsY19U="; - x86_64-linux = "sha256-kJNFPXiZekjofGtKFbGc85c8yQymhntkCBuhylwQBpE="; + aarch64-linux = "sha256-Gplg0QD7DcibaOv1Q8RUnefACZdNnM8yKYYiP1dpY58="; + x86_64-linux = "sha256-qcV4n9/nAbb0Gw8azorDSjpjy4cXe2XlR94WwuwUEyc="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; 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 024/272] 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 cd55b65d4eabcba3d0eca5355ef195d2f1c54c99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 May 2025 00:03:10 +0000 Subject: [PATCH 025/272] free42: 3.2.8 -> 3.3.4 --- pkgs/by-name/fr/free42/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix index f551bd24c91f..3ab64765ff10 100644 --- a/pkgs/by-name/fr/free42/package.nix +++ b/pkgs/by-name/fr/free42/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "free42"; - version = "3.2.8"; + version = "3.3.4"; src = fetchFromGitHub { owner = "thomasokken"; repo = "free42"; tag = "v${finalAttrs.version}"; - hash = "sha256-Hvq5YoiBVgKjz/+SVeF5WTj7CUZ7MrrFIAeesH3we68="; + hash = "sha256-4EEk11/a9kie1sXO1lpJ7GGqjQ2Wvcvg7uhlD6RzyP0="; }; nativeBuildInputs = [ From 9291e4c2a03e4d9366dc3f6245b9f388192a6372 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 May 2025 09:47:25 +0000 Subject: [PATCH 026/272] python3Packages.pynitrokey: 0.8.1 -> 0.8.3 --- pkgs/development/python-modules/pynitrokey/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynitrokey/default.nix b/pkgs/development/python-modules/pynitrokey/default.nix index cd99131143f0..1852360f7324 100644 --- a/pkgs/development/python-modules/pynitrokey/default.nix +++ b/pkgs/development/python-modules/pynitrokey/default.nix @@ -30,7 +30,7 @@ let pname = "pynitrokey"; - version = "0.8.1"; + version = "0.8.3"; mainProgram = "nitropy"; in @@ -40,7 +40,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-HLqT4r0ljRU5TYRJuBJvt9tF0igxaerUEPobyzWLCO8="; + hash = "sha256-GPg034MhJLROSERWasZyvklckLICBI6XWMTLC++nX4g="; }; nativeBuildInputs = [ installShellFiles ]; From 327a1dc1e5b882cacc7cbc80686cf34c9652e5a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 May 2025 17:26:33 +0000 Subject: [PATCH 027/272] sogo: 5.11.2 -> 5.12.1 --- pkgs/by-name/so/sogo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/sogo/package.nix b/pkgs/by-name/so/sogo/package.nix index 797f5ca2668b..621c504aa56a 100644 --- a/pkgs/by-name/so/sogo/package.nix +++ b/pkgs/by-name/so/sogo/package.nix @@ -25,14 +25,14 @@ clangStdenv.mkDerivation rec { pname = "sogo"; - version = "5.11.2"; + version = "5.12.1"; # always update the sope package as well, when updating sogo src = fetchFromGitHub { owner = "Alinto"; repo = "sogo"; rev = "SOGo-${version}"; - hash = "sha256-c+547x7ugYoLMgGVLcMmmb9rzquRJOv8n+Js2CuE7I0="; + hash = "sha256-BBFo8h0YnE/qHbAwu+vHX+eu9f4WXMs1gQT2nAxiPgc="; }; nativeBuildInputs = [ From 1a1d0e5661ba8d22c31bec67c03099d4f9cf0960 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 May 2025 23:55:24 +0000 Subject: [PATCH 028/272] worldpainter: 2.23.2 -> 2.24.1 --- pkgs/by-name/wo/worldpainter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wo/worldpainter/package.nix b/pkgs/by-name/wo/worldpainter/package.nix index d37b99ce782f..22c13cf57525 100644 --- a/pkgs/by-name/wo/worldpainter/package.nix +++ b/pkgs/by-name/wo/worldpainter/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { pname = "worldpainter"; - version = "2.23.2"; + version = "2.24.1"; src = fetchurl { url = "https://www.worldpainter.net/files/${pname}_${version}.tar.gz"; - hash = "sha256-FhrfI2/mBeIZAg26Q8x8T2YU2ANwAkoC3h9Tgw6ggoY="; + hash = "sha256-I7bf+BKaHSsR08stLtJu+wY5ek8cj+SjRVwu+RwqEq0="; }; nativeBuildInputs = [ From 48ccdb5d4e3329bb7c44d0ac6788a3de80cc3383 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 9 May 2025 21:42:10 +0200 Subject: [PATCH 029/272] 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 030/272] 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 031/272] 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 032/272] 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 033/272] 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 034/272] 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 035/272] 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 036/272] 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 f17b3b256d2c1a3abd1246dddab6892747ba8446 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 May 2025 23:37:03 +0000 Subject: [PATCH 037/272] sope: 5.11.2 -> 5.12.1 --- pkgs/by-name/so/sope/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/sope/package.nix b/pkgs/by-name/so/sope/package.nix index e4d1d2a1a2b8..7eb5ebfbf466 100644 --- a/pkgs/by-name/so/sope/package.nix +++ b/pkgs/by-name/so/sope/package.nix @@ -14,13 +14,13 @@ clangStdenv.mkDerivation rec { pname = "sope"; - version = "5.11.2"; + version = "5.12.1"; src = fetchFromGitHub { owner = "Alinto"; repo = "sope"; rev = "SOPE-${version}"; - hash = "sha256-6vec2ZgpK5jcKr3c2SLn6fLAun56MDjupWtR6dMdjag="; + hash = "sha256-a7uOFiPnZ++ACV1Ggwh+YtP+NQYS4datQdlPtG+qlg0="; }; buildInputs = From 502d9ad1699817cd3fa5c37a977ab5a421c28b46 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 15 May 2025 06:16:07 +0100 Subject: [PATCH 038/272] libxmp: 4.6.2 -> 4.6.3 Changes: https://sourceforge.net/p/xmp/libxmp/ci/libxmp-4.6.3/tree/docs/Changelog --- pkgs/by-name/li/libxmp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libxmp/package.nix b/pkgs/by-name/li/libxmp/package.nix index c5d177117f59..e23be1dd83a3 100644 --- a/pkgs/by-name/li/libxmp/package.nix +++ b/pkgs/by-name/li/libxmp/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxmp"; - version = "4.6.2"; + version = "4.6.3"; src = fetchFromGitHub { owner = "libxmp"; repo = "libxmp"; tag = "libxmp-${finalAttrs.version}"; - hash = "sha256-AfHathuBmF9OhtTyt8WabZKzFtnAkX1YeiYFF079z80="; + hash = "sha256-VTjS5bVu+jiswP4GCTxcAdhtVdtopy4A3hxlzIQlZVU="; }; outputs = [ From 3948075eb59320a6a3c20fde75209761ac765d42 Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 8 May 2025 01:34:45 +0800 Subject: [PATCH 039/272] beekeeper-studio: fix update script --- pkgs/by-name/be/beekeeper-studio/package.nix | 7 +------ pkgs/by-name/be/beekeeper-studio/update.sh | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) create mode 100755 pkgs/by-name/be/beekeeper-studio/update.sh diff --git a/pkgs/by-name/be/beekeeper-studio/package.nix b/pkgs/by-name/be/beekeeper-studio/package.nix index 3bd484a1db57..3f80d92b09cd 100644 --- a/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/pkgs/by-name/be/beekeeper-studio/package.nix @@ -26,8 +26,6 @@ vulkan-loader, systemd, libGL, - writeShellScript, - nix-update, }: stdenv.mkDerivation (finalAttrs: { @@ -113,10 +111,7 @@ stdenv.mkDerivation (finalAttrs: { } $out/opt/beekeeper-studio/beekeeper-studio-bin ''; - passthru.updateScript = writeShellScript "beekeeper-studio-update-script" '' - ${lib.getExe nix-update} beekeeper-studio --system x86_64-linux - ${lib.getExe nix-update} beekeeper-studio --system aarch64-linux --version "skip" - ''; + passthru.updateScript = ./update.sh; meta = { description = "Modern and easy to use SQL client for MySQL, Postgres, SQLite, SQL Server, and more"; diff --git a/pkgs/by-name/be/beekeeper-studio/update.sh b/pkgs/by-name/be/beekeeper-studio/update.sh new file mode 100755 index 000000000000..8bca15d4e3c8 --- /dev/null +++ b/pkgs/by-name/be/beekeeper-studio/update.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused jq nix bash coreutils nix-update common-updater-scripts + +set -eou pipefail + +PACKAGE_DIR=$(realpath $(dirname $0)) + +latestVersion=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/beekeeper-studio/beekeeper-studio/releases/latest | jq --raw-output .tag_name | sed 's/^v//') + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; beekeeper-studio.version or (lib.getVersion beekeeper-studio)" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "package is up-to-date: $currentVersion" + exit 0 +fi + +nix-update beekeeper-studio --version "$latestVersion" || true + +hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url "$(nix eval -f . --raw beekeeper-studio.src.url --system aarch64-linux)")) +update-source-version beekeeper-studio $latestVersion $hash --system=aarch64-linux --ignore-same-version From 3ae0281a953b8ab9408e6a2ae26230342d86c180 Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 8 May 2025 02:25:03 +0800 Subject: [PATCH 040/272] beekeeper-studio: 5.1.5 -> 5.2.7 --- pkgs/by-name/be/beekeeper-studio/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/be/beekeeper-studio/package.nix b/pkgs/by-name/be/beekeeper-studio/package.nix index 3f80d92b09cd..4486fe2edc1c 100644 --- a/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/pkgs/by-name/be/beekeeper-studio/package.nix @@ -26,11 +26,12 @@ vulkan-loader, systemd, libGL, + krb5, }: stdenv.mkDerivation (finalAttrs: { pname = "beekeeper-studio"; - version = "5.1.5"; + version = "5.2.7"; src = let @@ -43,8 +44,8 @@ stdenv.mkDerivation (finalAttrs: { fetchurl { url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${finalAttrs.version}/beekeeper-studio_${finalAttrs.version}_${arch}.deb"; hash = selectSystem { - x86_64-linux = "sha256-ClKD5OnNhEBo1O3E3rXOGu9X8vVGZAOrfXQFppuEnbU="; - aarch64-linux = "sha256-64ID+psuwfiVTfBayILeotJ3en21Hsv8FMQj+IQjjyE="; + x86_64-linux = "sha256-lP+8tX0NNsBDnrBvjJxu2PwVAMbtnnoc+oFteq6KECs="; + aarch64-linux = "sha256-pbVppWkXZb184icW9CevdNQ3FBC/Wpjr9BSd9fwbzCs="; }; }; @@ -82,11 +83,10 @@ stdenv.mkDerivation (finalAttrs: { expat libgbm vulkan-loader + krb5 ]; - runtimeDependencies = map lib.getLib [ - systemd - ]; + runtimeDependencies = map lib.getLib [ systemd ]; installPhase = '' runHook preInstall @@ -104,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' patchelf --add-needed libGL.so.1 \ + --add-needed libEGL.so.1 \ --add-rpath ${ lib.makeLibraryPath [ libGL From 35f0d9e35ed94dba2845571d4a8c0d2427e454d1 Mon Sep 17 00:00:00 2001 From: Markus Rudy Date: Thu, 15 May 2025 10:36:40 +0200 Subject: [PATCH 041/272] linuxPackages.nvidia_x11.persistenced: remove dates from man pages The make target for nvidia-persistenced builds a man page which includes the current date into the footer, causing irreproducible builds. Overriding the `date` utility with the `true` utility removes the date from the footer entirely. Signed-off-by: Markus Rudy --- pkgs/os-specific/linux/nvidia-x11/persistenced.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index 30a335238ee7..749dc2acfb27 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ m4 ]; buildInputs = [ libtirpc ]; - inherit (nvidia_x11) makeFlags; + makeFlags = nvidia_x11.makeFlags ++ [ "DATE=true" ]; installFlags = [ "PREFIX=$(out)" ]; From 46f4abdd81a5a7334a55d11c13c3f9fe3540f161 Mon Sep 17 00:00:00 2001 From: Hoang Nguyen Date: Thu, 15 May 2025 23:24:51 +0700 Subject: [PATCH 042/272] kubie: disable the default update feature Ref: https://github.com/sbstp/kubie#for-distro-maintainers --- pkgs/by-name/ku/kubie/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ku/kubie/package.nix b/pkgs/by-name/ku/kubie/package.nix index db9baac735bb..cf25e473476a 100644 --- a/pkgs/by-name/ku/kubie/package.nix +++ b/pkgs/by-name/ku/kubie/package.nix @@ -16,6 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-+sSooE0KJqvWFdR63qazOMmSS8dV7MirYZ+sk7BnGQ4="; }; + buildNoDefaultFeatures = true; useFetchCargoVendor = true; cargoHash = "sha256-Yf8fAW65K7SLaRpvegjWBLVDV33sMGV+I1rqlWvx5Ss="; From eabe73d0012468956d326b9e384b639c42e4c323 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 May 2025 03:51:28 +0000 Subject: [PATCH 043/272] opentelemetry-collector-builder: 0.124.0 -> 0.126.0 --- pkgs/tools/misc/opentelemetry-collector/builder.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/builder.nix b/pkgs/tools/misc/opentelemetry-collector/builder.nix index 0637e73a4211..79aff8206e66 100644 --- a/pkgs/tools/misc/opentelemetry-collector/builder.nix +++ b/pkgs/tools/misc/opentelemetry-collector/builder.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "ocb"; # Also update `pkgs/tools/misc/opentelemetry-collector/releases.nix` # whenever that version changes. - version = "0.124.0"; + version = "0.126.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "cmd/builder/v${version}"; - hash = "sha256-CfqCMVObS1TUYO0DqNdqRSPS1cG0TiKvyBaHH57BPNw="; + hash = "sha256-YxNo5xY+Fnw690eKzLgnJHeR0qxzk+ZtOlqKIpnaFjM="; }; sourceRoot = "${src.name}/cmd/builder"; - vendorHash = "sha256-1wgS9AIoFHlSUoELEQVvx+bCnTApEvwKRhTKGrcUGM8="; + vendorHash = "sha256-tZXghqPpvLU5+TPXXyWaXm0xBaTd8FdKslPoK02WFr8="; env.CGO_ENABLED = 0; ldflags = [ From 7ad05bdb77ab3fd1c6eb1e22fc74c0a0ec8ecc12 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 16 May 2025 12:34:23 +0200 Subject: [PATCH 044/272] 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 045/272] 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 046/272] 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 53b3401d388a7f45e5ac707090d8eaa71679f924 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 May 2025 15:00:37 +0000 Subject: [PATCH 047/272] ente-web: 1.0.4 -> 1.0.10 --- pkgs/by-name/en/ente-web/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/en/ente-web/package.nix b/pkgs/by-name/en/ente-web/package.nix index 3c8515170b43..45f93496ccf3 100644 --- a/pkgs/by-name/en/ente-web/package.nix +++ b/pkgs/by-name/en/ente-web/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ente-web"; - version = "1.0.4"; + version = "1.0.10"; src = fetchFromGitHub { owner = "ente-io"; @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { sparseCheckout = [ "web" ]; tag = "photos-v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-M1kAZgqjbWNn6LqymtWRmAk/v0vWEGbyS50lVrsr85o="; + hash = "sha256-WJz1Weh17DWH5qzMry1uacHBXY9ouIXWRzoiwzIsN0I="; }; sourceRoot = "${finalAttrs.src.name}/web"; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/web/yarn.lock"; - hash = "sha256-EYhYwy6+7bgWckU/7SfL1PREWw9JUgKxWadSVtoZwXs="; + hash = "sha256-9LC5WuS1CBj3vBacXUxJXyPgvZ/zfcihjZpCiH/8Aa0="; }; nativeBuildInputs = [ From 96d61cc488a360573c729e7539975c73bdd65f89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 May 2025 01:38:43 +0000 Subject: [PATCH 048/272] obs-studio-plugins.obs-3d-effect: 0.1.3 -> 0.1.4 --- pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix b/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix index 0a80098f5d1b..ff4cbf415c9d 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "obs-3d-effect"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-3d-effect"; rev = version; - sha256 = "sha256-SgxrBhuO3IaqINwjwdtn31cIcu3hXiPZyVMZJiNsO+s="; + sha256 = "sha256-5cPXfEcKIATFQktjIN5lmYjvakYe/k26aHKlJz5FqPE="; }; nativeBuildInputs = [ cmake ]; From 3bfe0a499ee44209ea2df5fce54d2d0ff2552305 Mon Sep 17 00:00:00 2001 From: Bruno Bigras <24027+bbigras@users.noreply.github.com> Date: Fri, 16 May 2025 21:55:25 -0400 Subject: [PATCH 049/272] veilid: 0.4.4 -> 0.4.6 --- pkgs/by-name/ve/veilid/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ve/veilid/package.nix b/pkgs/by-name/ve/veilid/package.nix index bab5c1c96643..bde4286180b5 100644 --- a/pkgs/by-name/ve/veilid/package.nix +++ b/pkgs/by-name/ve/veilid/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "veilid"; - version = "0.4.4"; + version = "0.4.6"; src = fetchFromGitLab { owner = "veilid"; repo = pname; rev = "v${version}"; - hash = "sha256-p9bQ90zUXVeVPUDuns+gmZb9SJHpAVrJOHe+RvEru7w="; + hash = "sha256-bKll7VB6LjkmmhN5lmjcSeP2zZbyWnl4XiZbZe3tKgg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-xbtlZ7PP+RHPlW4a9UCmaCOcsQkDyPim3yPObbXVqns="; + cargoHash = "sha256-505gf4P/Hlo8KFynhAQdBagzEqGXhydhTTknat/jWmk="; nativeBuildInputs = [ capnproto From 727809f534ff37bb5e4486084a7125b04a175373 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Fri, 16 May 2025 21:31:51 -0700 Subject: [PATCH 050/272] nixos/k3s: get tests working again Some of the attributes fetched throw, so tryEval them. Recurse into the attribute set to pick up all the tests. --- nixos/tests/k3s/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/tests/k3s/default.nix b/nixos/tests/k3s/default.nix index 4ee3cb760b39..5240f029139f 100644 --- a/nixos/tests/k3s/default.nix +++ b/nixos/tests/k3s/default.nix @@ -4,9 +4,11 @@ lib ? pkgs.lib, }: let - allK3s = lib.filterAttrs (n: _: lib.strings.hasPrefix "k3s_" n) pkgs; + allK3s = lib.filterAttrs ( + n: _: lib.strings.hasPrefix "k3s_" n && (builtins.tryEval pkgs.${n}).success + ) pkgs; in -{ +lib.recurseIntoAttrs { airgap-images = lib.mapAttrs ( _: k3s: import ./airgap-images.nix { inherit system pkgs k3s; } ) allK3s; From 44d7b6dd7bab8ff7fc71da3ba91eb09e5d19d83f Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Fri, 16 May 2025 21:29:56 -0700 Subject: [PATCH 051/272] k3s: use util-linuxMinimal The full version of util-linux has systemd, NLS, and ncurses support. k3s only uses a couple utilities from it at runtime, so use the minimal version. --- pkgs/applications/networking/cluster/k3s/builder.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index fdd70a653ee5..5e23e64a3cbc 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -69,7 +69,7 @@ lib: sqlite, stdenv, systemd, - util-linux, + util-linuxMinimal, yq-go, zstd, }: @@ -377,7 +377,7 @@ buildGoModule rec { ipset bridge-utils ethtool - util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 + util-linuxMinimal # kubelet wants 'nsenter' and 'mount' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 conntrack-tools runc bash From 4cf4acae57e3be36f86d3f69b9a1e98e68793863 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Fri, 16 May 2025 21:40:52 -0700 Subject: [PATCH 052/272] k3s: #405952: fix mount regression Until #405952 is fixed, we can use our own util-linux to avoid breaking k3s in the release. Revert this commit when that happens. --- .../networking/cluster/k3s/builder.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 5e23e64a3cbc..e31d6203bc5f 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -41,6 +41,7 @@ lib: ethtool, fetchFromGitHub, fetchgit, + fetchpatch, fetchurl, fetchzip, findutils, @@ -331,6 +332,17 @@ let ldflags = versionldflags; }).overrideAttrs overrideContainerdAttrs; + + # TODO (#405952): remove this patch. We had to add it to avoid a mass rebuild + # for the 25.05 release. Once the above PR is merged, switch back to plain util-linuxMinimal. + k3sUtilLinux = util-linuxMinimal.overrideAttrs (prev: { + patches = + prev.patches or [ ] + ++ lib.singleton (fetchpatch { + url = "https://github.com/util-linux/util-linux/pull/3479.patch"; + hash = "sha256-bJqpZiPli5Pm/XpDA445Ab5jesXrlcnaO6e4V0B3rSw="; + }); + }); in buildGoModule rec { pname = "k3s"; @@ -377,7 +389,7 @@ buildGoModule rec { ipset bridge-utils ethtool - util-linuxMinimal # kubelet wants 'nsenter' and 'mount' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 + k3sUtilLinux # kubelet wants 'nsenter' and 'mount' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 conntrack-tools runc bash From 3de9866a865681e9bbf88eafdd242afd06c36b97 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Sat, 17 May 2025 15:17:43 +0200 Subject: [PATCH 053/272] python3Packages.whisperx: disable import check for aarch64-linux `onnxruntime` fails to find the logger in sandboxed `aarch64-linux` builds, and promptly segfaults. As all other builds will check this import, I doubt this has an effect on package health. --- pkgs/development/python-modules/whisperx/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/whisperx/default.nix b/pkgs/development/python-modules/whisperx/default.nix index c97e62afe913..e08506532d80 100644 --- a/pkgs/development/python-modules/whisperx/default.nix +++ b/pkgs/development/python-modules/whisperx/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -71,7 +72,12 @@ buildPythonPackage rec { # This has been updated on main, so we expect this clause to be removed upon the next update. pythonRelaxDeps = [ "faster-whisper" ]; - pythonImportsCheck = [ "whisperx" ]; + # Import check fails due on `aarch64-linux` ONLY in the sandbox due to onnxruntime + # not finding its default logger, which then promptly segfaults. + # Simply run the import check on every other platform instead. + pythonImportsCheck = lib.optionals ( + !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) + ) [ "whisperx" ]; # No tests in repository doCheck = false; From bdb59d089f8ba2c24b22a638e4ef3d401aafd9c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 May 2025 15:39:03 +0000 Subject: [PATCH 054/272] python3Packages.bitarray: 3.3.0 -> 3.4.1 --- pkgs/development/python-modules/bitarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index fae1cf96cc82..554b317c273d 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "3.3.0"; + version = "3.4.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BEkJzmO3et9XOd5A4vYhRzRT6dS9uRPvLRTBhaRTLOc="; + hash = "sha256-5fqIcyu8+1Q37lVOGPhCqPbIa+c2VrBYDuFG/Tcxdsk="; }; build-system = [ setuptools ]; From 9d5009deaead6bc50e9ba7d1f747eb1e7b1b3b7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 May 2025 20:12:58 +0000 Subject: [PATCH 055/272] iosevka: 33.2.2 -> 33.2.3 --- pkgs/by-name/io/iosevka/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix index 1f2e8a90d937..78f4152180ca 100644 --- a/pkgs/by-name/io/iosevka/package.nix +++ b/pkgs/by-name/io/iosevka/package.nix @@ -56,16 +56,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "33.2.2"; + version = "33.2.3"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-dhMTcceHru/uLHRY4eWzFV+73ckCBBnDlizP3iY5w5w="; + hash = "sha256-dCHJYGZYTvjDtM2V+NdwXNxHg4kkcVAQD0G3DPtu5ps="; }; - npmDepsHash = "sha256-5DcMV9N16pyQxRaK6RCoeghZqAvM5EY1jftceT/bP+o="; + npmDepsHash = "sha256-eqWf5d9uCMkvDNPlICUt7QVT+2WsU0u+TE14ZraWXXE="; nativeBuildInputs = [ From 9b29a33ecb8afd2852fa9e5678c01e44f89f2809 Mon Sep 17 00:00:00 2001 From: Konrad Malik Date: Sat, 17 May 2025 22:24:56 +0200 Subject: [PATCH 056/272] netcoredbg: 3.1.0-1031 -> 3.1.2-1054 --- pkgs/by-name/ne/netcoredbg/deps.json | 53 ++++++++++++-------------- pkgs/by-name/ne/netcoredbg/package.nix | 10 ++--- 2 files changed, 29 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/ne/netcoredbg/deps.json b/pkgs/by-name/ne/netcoredbg/deps.json index 002cb71be2ad..66a3323b62c1 100644 --- a/pkgs/by-name/ne/netcoredbg/deps.json +++ b/pkgs/by-name/ne/netcoredbg/deps.json @@ -31,68 +31,63 @@ }, { "pname": "Microsoft.Diagnostics.DbgShim", - "version": "8.0.532401", - "hash": "sha256-rvTxIxaW6WYlbNqV0mVjX3JkjxOB2eoDtm7HD3qgKvg=" + "version": "9.0.621003", + "hash": "sha256-xdRwwLonXgqp4G+HWmFe5pEdv/x0L51/8jOqV5allZ4=" }, { "pname": "Microsoft.Diagnostics.DbgShim.linux-arm", - "version": "8.0.532401", - "hash": "sha256-LYDAN85Qsnj3TIdH1VzzIbeQRQfo4A9kYp/da0nZMX4=" + "version": "9.0.621003", + "hash": "sha256-wcr6S8ktct8XNtXnEOCUHqA13N+7rQytgGkUsp1j4aU=" }, { "pname": "Microsoft.Diagnostics.DbgShim.linux-arm64", - "version": "8.0.532401", - "hash": "sha256-/1eElmNjO8ug2i0hzsnX+ksaeTlSrJNxuHBZZ5Mxw7A=" + "version": "9.0.621003", + "hash": "sha256-OGsfVeZ4LcgOb2aM/e38Kyw9YGBn0t0uH8qgFdj8SIA=" }, { "pname": "Microsoft.Diagnostics.DbgShim.linux-musl-arm", - "version": "8.0.532401", - "hash": "sha256-3FsyQbXHgUErMg4islyZ68ZOi22Dtc7bHuzV4cHTetQ=" + "version": "9.0.621003", + "hash": "sha256-ZUno/Sd0UWYVVD20sJj/HleDfLcb7kf32j5NvIAYSMc=" }, { "pname": "Microsoft.Diagnostics.DbgShim.linux-musl-arm64", - "version": "8.0.532401", - "hash": "sha256-UCGQZZ9ZQKgdvVpgJfKAUL1hDxopEOpkb71x11mZ5go=" + "version": "9.0.621003", + "hash": "sha256-SKrqZiGnDdisdCIIETozCuSgj3JCAZeWfo2Ru/sMmOw=" }, { "pname": "Microsoft.Diagnostics.DbgShim.linux-musl-x64", - "version": "8.0.532401", - "hash": "sha256-zpKJdEGHfrk/ty0s2TuPiNi/yanEk6iAVZDOgBlv20s=" + "version": "9.0.621003", + "hash": "sha256-/kEBxB4puJJHwC71W2QQlOMykKCeNGvNy2j6s91g6jc=" }, { "pname": "Microsoft.Diagnostics.DbgShim.linux-x64", - "version": "8.0.532401", - "hash": "sha256-maN37KzN1GxFW37E2t8suG1XHNfTIdDLTHxiaiwGfdc=" + "version": "9.0.621003", + "hash": "sha256-rW9QGI1awjHBHWaMwFtfhgXuR3X/PBxuks0DgnT2684=" }, { "pname": "Microsoft.Diagnostics.DbgShim.osx-arm64", - "version": "8.0.532401", - "hash": "sha256-4+hYe0f09F/seep1K1O9uF1S+g0ygyNJIcqA3b4Fhh4=" + "version": "9.0.621003", + "hash": "sha256-BXi0IePavjClLQcSrXZXGOqkkoymdecw9ZFf5w0mpRs=" }, { "pname": "Microsoft.Diagnostics.DbgShim.osx-x64", - "version": "8.0.532401", - "hash": "sha256-K/0i5SGl3rG8ciXbhSu2dWURlzfB2uVorv2yc7KKP4I=" - }, - { - "pname": "Microsoft.Diagnostics.DbgShim.win-arm", - "version": "8.0.532401", - "hash": "sha256-m/XEdwtXKGGIB1ORetiEaJ5qnQa+wz1Ou+aspxHAhe0=" + "version": "9.0.621003", + "hash": "sha256-FXkjxK3Bq4twUJ69aqsCgv2hNpO2Lkuz7EPAtqxJWd0=" }, { "pname": "Microsoft.Diagnostics.DbgShim.win-arm64", - "version": "8.0.532401", - "hash": "sha256-QPo/eFVr7HCAeOcLlsOrukL78BWfs+nZHVr5ClZzCiQ=" + "version": "9.0.621003", + "hash": "sha256-NScEkmv6oh+wXn5D7Nb0AoNSb1PU+HgUpd8fpup+a6o=" }, { "pname": "Microsoft.Diagnostics.DbgShim.win-x64", - "version": "8.0.532401", - "hash": "sha256-gxTB3KBr/ROgbBpLGQogtg2dz7a8F26UWyzsMJYMzv4=" + "version": "9.0.621003", + "hash": "sha256-sfe0tF2D3BpktS9J0o1xsR2cWIkDGhzXaUvKsgHDqC0=" }, { "pname": "Microsoft.Diagnostics.DbgShim.win-x86", - "version": "8.0.532401", - "hash": "sha256-CP1WHi8a3Xr0ml2Dnhmhc14xSGqHPnrfnrfeuhZmm6o=" + "version": "9.0.621003", + "hash": "sha256-CRUYEGm3lqOO3FDn8kr3OUjxmIHNe1ntihN6UaFeDs8=" }, { "pname": "Microsoft.NETCore.Platforms", diff --git a/pkgs/by-name/ne/netcoredbg/package.nix b/pkgs/by-name/ne/netcoredbg/package.nix index f2dc49a18410..f0e6f88abe98 100644 --- a/pkgs/by-name/ne/netcoredbg/package.nix +++ b/pkgs/by-name/ne/netcoredbg/package.nix @@ -12,17 +12,17 @@ }: let pname = "netcoredbg"; - build = "1031"; - release = "3.1.0"; + build = "1054"; + release = "3.1.2"; version = "${release}-${build}"; - hash = "sha256-/ScV6NPGOun47D88e7BLisSOipeQWdUbYaEryrlPbHg="; + hash = "sha256-WORGZXbq6d3sxGqyG8oZSwcBoVaD3D56t9K6PJoKFsM="; - coreclr-version = "v8.0.7"; + coreclr-version = "v8.0.16"; coreclr-src = fetchFromGitHub { owner = "dotnet"; repo = "runtime"; rev = coreclr-version; - hash = "sha256-vxyhZ1Z5TB/2jpF4qiXTpUj1hKeqV7xPgG1BJYOLIko="; + hash = "sha256-/fSKCIugR3UhqxBxtQRw+Bw+UpaSjB4xj0iBiXJaiR4="; }; dotnet-sdk = dotnetCorePackages.sdk_8_0; From f63ba2b0b633b8f928054887544304fb630ad5d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 00:52:19 +0000 Subject: [PATCH 057/272] 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 058/272] 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 059/272] 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 060/272] 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 061/272] 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 062/272] 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 063/272] 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 064/272] 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 065/272] 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 299a895e2ae2a478949c0b0b77de3e0f61935c04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 06:23:26 +0000 Subject: [PATCH 066/272] gowebly: 3.0.2 -> 3.0.3 --- pkgs/by-name/go/gowebly/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gowebly/package.nix b/pkgs/by-name/go/gowebly/package.nix index 0af5a04ef766..f44aa0dad7b4 100644 --- a/pkgs/by-name/go/gowebly/package.nix +++ b/pkgs/by-name/go/gowebly/package.nix @@ -8,16 +8,16 @@ buildGo124Module rec { pname = "gowebly"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "gowebly"; repo = "gowebly"; tag = "v${version}"; - hash = "sha256-QsU5Brzs3FeFkQPmpXwehP1G6MocHtCZ9uhw1lFtOEU="; + hash = "sha256-iCdChT/eAWfeZyl5W1UHIjET3MGUD1YakjTToSS7iGs="; }; - vendorHash = "sha256-wOpenKh+4v0gRY0Zvx3URi4D1jXSrIONcrlzyjJUaSg="; + vendorHash = "sha256-mFCNrcdwSExjVym4BN1Yb/lsfQHxCDrlWoa9vyQ74ko="; env.CGO_ENABLED = 0; From 80cab842c4bd1eef1cf2273fa9a66ba57aa44db1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 May 2025 09:06:34 +0200 Subject: [PATCH 067/272] 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 068/272] 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 069/272] 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 e0c6648695f581b61f66506c1a825d1456f29bb9 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Sun, 18 May 2025 10:52:14 +0200 Subject: [PATCH 070/272] cinny-unwrapped: 4.6.0 -> 4.7.0 Release notes: https://github.com/cinnyapp/cinny/releases/tag/v4.7.0 Changelog: https://github.com/cinnyapp/cinny/compare/v4.6.0...v4.7.0 --- pkgs/by-name/ci/cinny-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix index c8a1b5da5b19..8bd7e28df524 100644 --- a/pkgs/by-name/ci/cinny-unwrapped/package.nix +++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix @@ -13,16 +13,16 @@ buildNpmPackage rec { pname = "cinny-unwrapped"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; rev = "v${version}"; - hash = "sha256-MyVKRWhLXxz4h2/2OtpmYrLYiZeNOMEetHwl4NklkOA="; + hash = "sha256-x4cRZ0XfyvRqOWIqtsVBiIPDxC3J9SUdoReiWNUB/X8="; }; - npmDepsHash = "sha256-WNK1ke5NEbt2Gb92hEItnwu65rI/5VsbZDfTSp6aKvg="; + npmDepsHash = "sha256-s8dKMGwg6DL+aEq0Sk04VF1pSDpAW18Dok113xDWb8Q="; nativeBuildInputs = [ python3 From 0d0f642cc5494b64ab1b8ca86dd8809c6d5da8f5 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Sun, 18 May 2025 10:53:47 +0200 Subject: [PATCH 071/272] cinny-desktop: 4.6.0 -> 4.7.0 Release notes: https://github.com/cinnyapp/cinny-desktop/releases/tag/v4.7.0 Changelog: https://github.com/cinnyapp/cinny-desktop/compare/v4.6.0...v4.7.0 --- pkgs/by-name/ci/cinny-desktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index c0238f2e22ad..1e316ac71015 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -18,19 +18,19 @@ rustPlatform.buildRustPackage rec { pname = "cinny-desktop"; # We have to be using the same version as cinny-web or this isn't going to work. - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; tag = "v${version}"; - hash = "sha256-tSZ7qSEoLNUnMICT1oVccMY9J6uVZu8QJGJA9NK8JwU="; + hash = "sha256-ls0ZxXiIrjyLL0MoxOTU/RK0k323nUiQfxtlwsEL45U="; }; sourceRoot = "${src.name}/src-tauri"; useFetchCargoVendor = true; - cargoHash = "sha256-5rIbVYxSsjv+MvmZxviMhcfYN+jOFndvZa7PDO5DLn8="; + cargoHash = "sha256-NSzGB6o6BBoak2gbSOu8ucWA+R+behuTxeMnKpyA7no="; postPatch = let From 51650dcf60688ff010b5b2dce6c1565e265bf190 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 18 May 2025 16:54:20 +0800 Subject: [PATCH 072/272] ptyxis: 47.10 -> 48.3 --- pkgs/by-name/pt/ptyxis/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pt/ptyxis/package.nix b/pkgs/by-name/pt/ptyxis/package.nix index 366a186d99ed..22eb0f46f25e 100644 --- a/pkgs/by-name/pt/ptyxis/package.nix +++ b/pkgs/by-name/pt/ptyxis/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "ptyxis"; - version = "47.10"; + version = "48.3"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "chergert"; repo = "ptyxis"; - rev = finalAttrs.version; - hash = "sha256-ZZwrqX7GkqMVtLhyzJvThzqmxg/PRwBxSshSv/Z7uKo="; + tag = finalAttrs.version; + hash = "sha256-Uj3RUMaPU/KHhhtsrw+kD5HBM+UY4MY/Ov4/8wjNpyI="; }; nativeBuildInputs = [ From 556eca1e184a84e294b6cb27c8daf4eb72ba8fc4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 08:57:51 +0000 Subject: [PATCH 073/272] 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 074/272] 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 a6b28e33549a3803d856ac258f6500f98e280caa Mon Sep 17 00:00:00 2001 From: Patrick Date: Sun, 18 May 2025 12:48:08 +0200 Subject: [PATCH 075/272] ghunt: 2.1.0 -> 2.3.3 --- pkgs/by-name/gh/ghunt/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gh/ghunt/package.nix b/pkgs/by-name/gh/ghunt/package.nix index 0f4c42ff05dd..975774ff09fa 100644 --- a/pkgs/by-name/gh/ghunt/package.nix +++ b/pkgs/by-name/gh/ghunt/package.nix @@ -6,20 +6,22 @@ python3.pkgs.buildPythonApplication rec { pname = "ghunt"; - version = "2.1.0"; + version = "2.3.3"; pyproject = true; src = fetchFromGitHub { owner = "mxrch"; repo = "ghunt"; - tag = "v${version}"; - hash = "sha256-UeHVATTyAH3Xdm/NVSUhiicM+tZ4UnLeJsy1jSLK3v8="; + # The newer releases aren't git-tagged to we just take the + # commit with the version bump + rev = "5782248bfd92a24875e112ed0a83e6986d4c70d0"; + hash = "sha256-SQk/hy4r9LIffsu3kxLTv5LCcEvcZkP2jhmPA6Fzo8U="; }; pythonRelaxDeps = true; nativeBuildInputs = with python3.pkgs; [ - setuptools + poetry-core ]; propagatedBuildInputs = @@ -29,6 +31,7 @@ python3.pkgs.buildPythonApplication rec { autoslot beautifulsoup4 beautifultable + dnspython geopy httpx humanize @@ -39,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { protobuf python-dateutil rich - trio + rich-argparse packaging ] ++ httpx.optional-dependencies.http2; From 0912a536623a3efadfa6d7a6408cceb9f0f4ba77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 11:57:25 +0000 Subject: [PATCH 076/272] 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 077/272] 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 078/272] 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 079/272] 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 080/272] 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 4d1712384cfffcc1fec8eae85e93133efa9cdc3f Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 18 May 2025 09:54:24 -0500 Subject: [PATCH 081/272] yabai: 7.1.14 -> 7.1.15 Changelog: https://github.com/koekeishiya/yabai/blob/v7.1.15/CHANGELOG.md --- pkgs/by-name/ya/yabai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index 02eff0f622c2..15d7c787e713 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "yabai"; - version = "7.1.14"; + version = "7.1.15"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information. "aarch64-darwin" = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; - hash = "sha256-cDONHrNPBTzEkVqxN1cHDqVumfyfcHrTYGZxn4s/mEA="; + hash = "sha256-QDGt/v5t7g6+y6ijpLRF7YkqF8bISfxk684m7uUg4eM="; }; "x86_64-darwin" = fetchFromGitHub { owner = "koekeishiya"; repo = "yabai"; rev = "v${finalAttrs.version}"; - hash = "sha256-YbEx1CzuvSFYFD3HgiZrrAd1x9cOQF6fGdgsOlkmUGU="; + hash = "sha256-HvaMPmXNlFVOezqWxqXaAUq8E8O2ZkXMQPwkKXCAOcY="; }; }; From fcf4ffd4cb15677e748fdf5902d58209a5ea356a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 14:57:43 +0000 Subject: [PATCH 082/272] 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 083/272] 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 12d609947aa41443ecf4d869caafe5950e251038 Mon Sep 17 00:00:00 2001 From: ojsef39 Date: Sun, 18 May 2025 14:31:18 +0000 Subject: [PATCH 084/272] renovate: 39.264.0 -> 40.14.4 --- nixos/doc/manual/release-notes/rl-2511.section.md | 2 ++ pkgs/by-name/re/renovate/package.nix | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index d0385c47644c..dd51f79eee0a 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -18,6 +18,8 @@ - The `services.polipo` module has been removed as `polipo` is unmaintained and archived upstream. +- `renovate` was updated to v40. See the [upstream release notes](https://github.com/renovatebot/renovate/releases/tag/40.0.0) for breaking changes. + ## Other Notable Changes {#sec-release-25.11-notable-changes} diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index e84299018587..841fb24a3123 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "renovate"; - version = "39.264.0"; + version = "40.14.4"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; tag = finalAttrs.version; - hash = "sha256-ACeZ0RAIplcaRKyoEXFCwA/zu96CaLxTwjV0ok3TQ8w="; + hash = "sha256-qL1pXlY9rBoZ5o4ZdiDAEv2zmLN42q9kma5/5yOlOno="; }; postPatch = '' @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-2F4vcdu2f0yh+hvs1WWM6MsWv2mmUUhzFVWN3BQvfNk="; + hash = "sha256-Uj+w9jzbWKLoJgRS5GVGY5QZAwIKsH/MoIu6OailgAw="; }; env.COREPACK_ENABLE_STRICT = 0; From 457438810ccc0875fdda2e99b233d80350ae3a28 Mon Sep 17 00:00:00 2001 From: Konstantin Bogdanov Date: Fri, 25 Apr 2025 14:53:09 +0200 Subject: [PATCH 085/272] maintainers: add thevar1able --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index de2af1f94e3a..54813fc30f55 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -24614,6 +24614,15 @@ githubId = 1220572; name = "Christian Theune"; }; + thevar1able = { + email = "var1able+nixpkgs@var1able.network"; + github = "thevar1able"; + githubId = 875885; + name = "Konstantin Bogdanov"; + keys = [ + { fingerprint = "3221 7A73 EB95 0E9E E550 36A3 DB39 9448 D9FE 52F1"; } + ]; + }; theverygaming = { name = "theverygaming"; github = "theverygaming"; From 6dbec0e85435c98ac19dc23b05e5e6f7d7e5e30e Mon Sep 17 00:00:00 2001 From: Konstantin Bogdanov Date: Fri, 25 Apr 2025 14:53:27 +0200 Subject: [PATCH 086/272] clickhouse: 24.3.7.30 -> 25.3.3.42 --- .../cl/clickhouse/package.nix} | 131 ++++-------------- pkgs/top-level/all-packages.nix | 4 - 2 files changed, 24 insertions(+), 111 deletions(-) rename pkgs/{servers/clickhouse/default.nix => by-name/cl/clickhouse/package.nix} (55%) diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/by-name/cl/clickhouse/package.nix similarity index 55% rename from pkgs/servers/clickhouse/default.nix rename to pkgs/by-name/cl/clickhouse/package.nix index 3e97c23b1a2a..cb8903eae19c 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/by-name/cl/clickhouse/package.nix @@ -1,9 +1,8 @@ { lib, - llvmPackages, - llvmPackages_16, + stdenv, + llvmPackages_19, fetchFromGitHub, - fetchpatch, cmake, ninja, python3, @@ -14,30 +13,23 @@ darwin, findutils, libiconv, - rustSupport ? true, - rustc, cargo, rustPlatform, }: -let - inherit (llvmPackages) stdenv; - mkDerivation = - (if stdenv.hostPlatform.isDarwin then llvmPackages_16.stdenv else llvmPackages.stdenv).mkDerivation; -in -mkDerivation rec { +llvmPackages_19.stdenv.mkDerivation (finalAttrs: { pname = "clickhouse"; - version = "24.3.7.30"; + version = "25.3.3.42"; src = fetchFromGitHub rec { owner = "ClickHouse"; repo = "ClickHouse"; - rev = "v${version}-lts"; + tag = "v${finalAttrs.version}-lts"; fetchSubmodules = true; - name = "clickhouse-${rev}.tar.gz"; - hash = "sha256-xIqn1cRbuD3NpUC2c7ZzvC8EAmg+XOXCkp+g/HTdIc0="; + name = "clickhouse-${tag}.tar.gz"; + hash = "sha256-VYT6Rnq7LaV9fZc4LJ9YtbWQDgEARYok8MjVfg8itIg="; postFetch = '' # delete files that make the source too big rm -rf $out/contrib/llvm-project/llvm/test @@ -62,20 +54,6 @@ mkDerivation rec { ''; }; - patches = [ - # They updated the Cargo.toml without updating the Cargo.lock :/ - (fetchpatch { - url = "https://github.com/ClickHouse/ClickHouse/commit/bccd33932b5fe17ced2dc2f27813da0b1c034afa.patch"; - revert = true; - hash = "sha256-4idwr+G8WGuT/VILKtDIJIvbCvi6pZokJFze4dP6ExE="; - }) - (fetchpatch { - url = "https://github.com/ClickHouse/ClickHouse/commit/b6bd5ecb199ef8a10e3008a4ea3d96087db8a8c1.patch"; - revert = true; - hash = "sha256-nbb/GV2qWEZ+BEfT6/9//yZf4VWdhOdJCI3PLeh6o0M="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ @@ -83,14 +61,14 @@ mkDerivation rec { ninja python3 perl - llvmPackages.lld + llvmPackages_19.lld ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ nasm yasm ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - llvmPackages.bintools + llvmPackages_19.bintools findutils darwin.bootstrap_cmds ] @@ -102,101 +80,38 @@ mkDerivation rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - # their vendored version is too old and missing this patch: https://github.com/corrosion-rs/corrosion/pull/205 - corrosionSrc = - if rustSupport then - fetchFromGitHub { - owner = "corrosion-rs"; - repo = "corrosion"; - rev = "v0.3.5"; - hash = "sha256-r/jrck4RiQynH1+Hx4GyIHpw/Kkr8dHe1+vTHg+fdRs="; - } - else - null; - corrosionDeps = - if rustSupport then - rustPlatform.fetchCargoVendor { - src = corrosionSrc; - name = "corrosion-deps"; - preBuild = "cd generator"; - hash = "sha256-ok1QLobiGBccmbEEWQxHz3ivvuT6FrOgG6wLK4gIbgU="; - } - else - null; - rustDeps = - if rustSupport then - rustPlatform.fetchCargoVendor { - inherit src; - name = "rust-deps"; - preBuild = "cd rust"; - hash = "sha256-nX5wBM8rVMbaf/IrPsqkdT2KQklQbBIGomeWSTjclR4="; - } - else - null; - dontCargoSetupPostUnpack = true; - postUnpack = lib.optionalString rustSupport '' - pushd source - - rm -rf contrib/corrosion - cp -r --no-preserve=mode $corrosionSrc contrib/corrosion - - pushd contrib/corrosion/generator - cargoDeps="$corrosionDeps" cargoSetupPostUnpackHook - corrosionDepsCopy="$cargoDepsCopy" - popd - - pushd rust - cargoDeps="$rustDeps" cargoSetupPostUnpackHook - rustDepsCopy="$cargoDepsCopy" - cat .cargo/config.toml >> .cargo/config.toml.in - cat .cargo/config.toml >> skim/.cargo/config.toml.in - rm .cargo/config.toml - popd - - popd - ''; postPatch = '' patchShebangs src/ + patchShebangs utils/ + + sed -i 's|/usr/bin/env perl|"${lib.getExe perl}"|' contrib/openssl-cmake/CMakeLists.txt substituteInPlace src/Storages/System/StorageSystemLicenses.sh \ - --replace 'git rev-parse --show-toplevel' '$src' - substituteInPlace utils/check-style/check-duplicate-includes.sh \ - --replace 'git rev-parse --show-toplevel' '$src' + --replace-fail '$(git rev-parse --show-toplevel)' "$NIX_BUILD_TOP/$sourceRoot" substituteInPlace utils/check-style/check-ungrouped-includes.sh \ - --replace 'git rev-parse --show-toplevel' '$src' + --replace-fail '$(git rev-parse --show-toplevel)' "$NIX_BUILD_TOP/$sourceRoot" substituteInPlace utils/list-licenses/list-licenses.sh \ - --replace 'git rev-parse --show-toplevel' '$src' - substituteInPlace utils/check-style/check-style \ - --replace 'git rev-parse --show-toplevel' '$src' + --replace-fail '$(git rev-parse --show-toplevel)' "$NIX_BUILD_TOP/$sourceRoot" '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's|gfind|find|' cmake/tools.cmake sed -i 's|ggrep|grep|' cmake/tools.cmake - '' - + lib.optionalString rustSupport '' - pushd contrib/corrosion/generator - cargoDepsCopy="$corrosionDepsCopy" cargoSetupPostPatchHook - popd - - pushd rust - cargoDepsCopy="$rustDepsCopy" cargoSetupPostPatchHook - popd - - cargoSetupPostPatchHook() { true; } - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' # Make sure Darwin invokes lld.ld64 not lld. substituteInPlace cmake/tools.cmake \ --replace '--ld-path=''${LLD_PATH}' '-fuse-ld=lld' + '' + + lib.optionalString rustSupport '' + cargoSetupPostPatchHook() { true; } ''; cmakeFlags = [ "-DENABLE_TESTS=OFF" + "-DENABLE_DELTA_KERNEL_RS=0" "-DCOMPILER_CACHE=disabled" "-DENABLE_EMBEDDED_COMPILER=ON" ] @@ -205,6 +120,7 @@ mkDerivation rec { ) "-DNO_ARMV81_OR_HIGHER=1"; env = { + CARGO_HOME = "$PWD/../.cargo/"; NIX_CFLAGS_COMPILE = # undefined reference to '__sync_val_compare_and_swap_16' lib.optionalString stdenv.hostPlatform.isx86_64 " -mcx16" @@ -224,9 +140,9 @@ mkDerivation rec { sed -i -e '\!/var/log/clickhouse-server/clickhouse-server\.log!d' \ $out/etc/clickhouse-server/config.xml substituteInPlace $out/etc/clickhouse-server/config.xml \ - --replace "/var/log/clickhouse-server/clickhouse-server.err.log" "1" + --replace-fail "/var/log/clickhouse-server/clickhouse-server.err.log" "1" substituteInPlace $out/etc/clickhouse-server/config.xml \ - --replace "trace" "warning" + --replace-fail "trace" "warning" ''; # Builds in 7+h with 2 cores, and ~20m with a big-parallel builder. @@ -241,10 +157,11 @@ mkDerivation rec { maintainers = with maintainers; [ orivej mbalatsko + thevar1able ]; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685 platforms = lib.filter (x: (lib.systems.elaborate x).is64bit) (platforms.linux ++ platforms.darwin); broken = stdenv.buildPlatform != stdenv.hostPlatform; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43c0e54c3637..d33792a3b425 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10278,10 +10278,6 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - clickhouse = callPackage ../servers/clickhouse { - llvmPackages = llvmPackages_16; - }; - clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli; couchdb3 = callPackage ../servers/http/couchdb/3.nix { }; From d17aba125e3a3d8bb04dddc08339ab1592e6a044 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 16:59:46 +0000 Subject: [PATCH 087/272] 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 0ca3c6bd5541e6cf81d25bc08d9d858bf4084b19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 18:43:37 +0000 Subject: [PATCH 088/272] mpls: 0.14.0 -> 0.15.0 --- pkgs/by-name/mp/mpls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mp/mpls/package.nix b/pkgs/by-name/mp/mpls/package.nix index 6bad2eb54488..9498995027d8 100644 --- a/pkgs/by-name/mp/mpls/package.nix +++ b/pkgs/by-name/mp/mpls/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "mpls"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "mhersson"; repo = "mpls"; tag = "v${version}"; - hash = "sha256-z3miAbL3qQHusWoofUp8kNNZjoGANhPjeIj39KPYyvc="; + hash = "sha256-7uBhc4FRe9KxRloHJQoDb8JvKPcev2DuTftnMBnmiGs="; }; - vendorHash = "sha256-xILlYrwcnMWAPACeELwVKGUBIK9QbrUSR03xVmNXsnE="; + vendorHash = "sha256-zEJBB5xJBJuLZQ/+yDyoFbkYXpqEkRXuIIhReBPKi+g="; ldflags = [ "-s" From 83a59bb3f63f023a0ad7436460944c0fb3f0b5df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 18:58:47 +0000 Subject: [PATCH 089/272] rofi-unwrapped: 1.7.8 -> 1.7.9 --- pkgs/applications/misc/rofi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 95597a6ee411..cb3793b782f4 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -29,14 +29,14 @@ stdenv.mkDerivation rec { pname = "rofi-unwrapped"; - version = "1.7.8"; + version = "1.7.9"; src = fetchFromGitHub { owner = "davatorium"; repo = "rofi"; rev = version; fetchSubmodules = true; - hash = "sha256-TEn3LoTUc5mxYcVkckIFTfkqQ9cUJxkXyg/5TFv5TZ0="; + hash = "sha256-YI6ShRRBJ9ExkzDnI31YjtI1mWRWPzVRYQvpTAtLTeI="; }; preConfigure = '' From 6f2e7ccfcedb24952e150a766475812c45500284 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 19:43:49 +0000 Subject: [PATCH 090/272] 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 22d51e08cf1fb1af0c01b1a40edc5a6b7330a91b Mon Sep 17 00:00:00 2001 From: Bruce Toll <4109762+tollb@users.noreply.github.com> Date: Mon, 24 Feb 2025 16:33:06 -0500 Subject: [PATCH 091/272] nixos/tests/systemd-journal: Fix failing tests Fix regression from https://github.com/NixOS/nixpkgs/pull/379629. The systemd-journal test has been failing on hydra since 2025-02-10. See, for instance: https://hydra.nixos.org/build/290855155. This commit enables auditing, as expected by the tests. It also addresses an issue where audit messages were getting dropped due to rate limits. --- nixos/tests/systemd-journal.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/tests/systemd-journal.nix b/nixos/tests/systemd-journal.nix index 63ae58970e84..8b7cca0d7e2e 100644 --- a/nixos/tests/systemd-journal.nix +++ b/nixos/tests/systemd-journal.nix @@ -12,11 +12,17 @@ import ./make-test-python.nix ( }; nodes.auditd = { security.auditd.enable = true; + security.audit.enable = true; environment.systemPackages = [ pkgs.audit ]; + boot.kernel.sysctl."kernel.printk_ratelimit" = 0; + boot.kernelParams = [ "audit_backlog_limit=8192" ]; }; nodes.journaldAudit = { services.journald.audit = true; + security.audit.enable = true; environment.systemPackages = [ pkgs.audit ]; + boot.kernel.sysctl."kernel.printk_ratelimit" = 0; + boot.kernelParams = [ "audit_backlog_limit=8192" ]; }; testScript = '' From e434130d0baea01c94270dd2589a2bd811c42116 Mon Sep 17 00:00:00 2001 From: benaryorg Date: Sat, 17 May 2025 13:02:22 +0000 Subject: [PATCH 092/272] nixos/systemd: unconditional systemd-journald-audit.socket Containers did not have *systemd-journald-audit.socket* in *additionalUpstreamSystemUnits*, which meant that the unit was not provided. However the *wantedBy* was added without any additional check, therefore creating an empty unit with just the *WantedBy* on *boot.isContainer* machines. This caused `systemd-analyze verify` to fail: ```text systemd-journald-audit.socket: Unit has no Listen setting (ListenStream=, ListenDatagram=, ListenFIFO=, ...). Refusing. systemd-journald-audit.socket: Cannot add dependency job, ignoring: Unit systemd-journald-audit.socket has a bad unit file setting. systemd-journald-audit.socket: Cannot add dependency job, ignoring: Unit systemd-journald-audit.socket has a bad unit file setting. ``` The upstream unit already contains the following, which should make it safe to include regardless: ```ini [Unit] ConditionSecurity=audit ConditionCapability=CAP_AUDIT_READ ``` For reference, this popped up in the context of #[360426](https://redirect.github.com/NixOS/nixpkgs/issues/360426) as well as #[407696](https://redirect.github.com/NixOS/nixpkgs/pull/407696). Co-authored-by: Bruce Toll <4109762+tollb@users.noreply.github.com> Signed-off-by: benaryorg --- .../modules/system/boot/systemd/journald.nix | 29 +++++++++---------- nixos/tests/systemd-journal.nix | 16 ++++++++++ 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/nixos/modules/system/boot/systemd/journald.nix b/nixos/modules/system/boot/systemd/journald.nix index c30630e04e4b..4d2ca7f11f21 100644 --- a/nixos/modules/system/boot/systemd/journald.nix +++ b/nixos/modules/system/boot/systemd/journald.nix @@ -116,22 +116,19 @@ in }; config = { - systemd.additionalUpstreamSystemUnits = - [ - "systemd-journald.socket" - "systemd-journald@.socket" - "systemd-journald-varlink@.socket" - "systemd-journald.service" - "systemd-journald@.service" - "systemd-journal-flush.service" - "systemd-journal-catalog-update.service" - "systemd-journald-sync@.service" - ] - ++ (lib.optional (!config.boot.isContainer) "systemd-journald-audit.socket") - ++ [ - "systemd-journald-dev-log.socket" - "syslog.socket" - ]; + systemd.additionalUpstreamSystemUnits = [ + "systemd-journald.socket" + "systemd-journald@.socket" + "systemd-journald-varlink@.socket" + "systemd-journald.service" + "systemd-journald@.service" + "systemd-journal-flush.service" + "systemd-journal-catalog-update.service" + "systemd-journald-sync@.service" + "systemd-journald-audit.socket" + "systemd-journald-dev-log.socket" + "syslog.socket" + ]; systemd.sockets.systemd-journald-audit.wantedBy = [ "systemd-journald.service" diff --git a/nixos/tests/systemd-journal.nix b/nixos/tests/systemd-journal.nix index 8b7cca0d7e2e..c39fc50e5006 100644 --- a/nixos/tests/systemd-journal.nix +++ b/nixos/tests/systemd-journal.nix @@ -24,6 +24,12 @@ import ./make-test-python.nix ( boot.kernel.sysctl."kernel.printk_ratelimit" = 0; boot.kernelParams = [ "audit_backlog_limit=8192" ]; }; + nodes.containerCheck = { + containers.c1 = { + autoStart = true; + config = { }; + }; + }; testScript = '' machine.wait_for_unit("multi-user.target") @@ -56,6 +62,16 @@ import ./make-test-python.nix ( # logs ideally should NOT end up in kmesg, but they do due to # https://github.com/systemd/systemd/issues/15324 journaldAudit.succeed("journalctl _TRANSPORT=kernel --grep 'unit=systemd-journald'") + + + with subtest("container systemd-journald-audit not running"): + containerCheck.wait_for_unit("multi-user.target"); + containerCheck.wait_until_succeeds("systemctl -M c1 is-active default.target"); + + # systemd-journald-audit.socket should exist but not run due to the upstream unit's `Condition*` settings + (status, output) = containerCheck.execute("systemctl -M c1 is-active systemd-journald-audit.socket") + containerCheck.log(output) + assert status == 3 and output == "inactive\n", f"systemd-journald-audit.socket should exist in a container but remain inactive, was {output}" ''; } ) From 48519415ce26595fcb84041628050089f5a45a93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 May 2025 20:24:33 +0000 Subject: [PATCH 093/272] 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 094/272] 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 095/272] 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 096/272] 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 097/272] 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 098/272] 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 099/272] 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 100/272] 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 9b14f098b29e994c2dc4d4892b3d07d43599064e Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 18 May 2025 18:31:29 -0500 Subject: [PATCH 101/272] upgrade-assistant: 0.5.1073 -> 0.5.1084 --- pkgs/by-name/up/upgrade-assistant/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/up/upgrade-assistant/package.nix b/pkgs/by-name/up/upgrade-assistant/package.nix index 92958219cdf1..d24ed84845d9 100644 --- a/pkgs/by-name/up/upgrade-assistant/package.nix +++ b/pkgs/by-name/up/upgrade-assistant/package.nix @@ -1,9 +1,9 @@ { lib, buildDotnetGlobalTool }: buildDotnetGlobalTool { pname = "upgrade-assistant"; - version = "0.5.1073"; + version = "0.5.1084"; - nugetHash = "sha256-kk3SIv1gp9xtof0MkGkNUiqGuXgy1+YMGxLFZPFsw+0="; + nugetHash = "sha256-O+HHLqou6hRAQ8vUzq+VfX0vRM+nZGPnfCg8niYX2gE="; meta = { homepage = "https://github.com/dotnet/upgrade-assistant"; From d7d9f0008fe9e20a42934287ccb795cbd4674246 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 19 May 2025 09:48:44 +0900 Subject: [PATCH 102/272] dprint: 0.49.1 -> 0.50.0 Diff: https://github.com/dprint/dprint/compare/0.49.1...0.50.0 --- pkgs/by-name/dp/dprint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix index fcb400baf9a4..fe27c3c1eed9 100644 --- a/pkgs/by-name/dp/dprint/package.nix +++ b/pkgs/by-name/dp/dprint/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.49.1"; + version = "0.50.0"; # Prefer repository rather than crate here # - They have Cargo.lock in the repository @@ -20,11 +20,11 @@ rustPlatform.buildRustPackage rec { owner = "dprint"; repo = "dprint"; tag = version; - hash = "sha256-6ye9FqOGW40TqoDREQm6pZAQaSuO2o9SY5RSfpmwKV4="; + hash = "sha256-6AgbKH5f7N/yYqq7KBVHOqYbyuZkjFSaYwZwIXsgd9o="; }; useFetchCargoVendor = true; - cargoHash = "sha256-OHRXujyewiDlY4AQEEqmcnmdec1lbWH/y6tPW1nNExE="; + cargoHash = "sha256-OnrsuVK1gEDweldq+P8lDkkrHjklsG8MRpM0wqWsdlM="; nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ installShellFiles From f8b64359d97073fe84ea8bd5391954861f4055a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 02:02:00 +0000 Subject: [PATCH 103/272] 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 95d37034c69bc20c49aefadd89e8bd1a030b380b Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 19 May 2025 10:53:37 +0900 Subject: [PATCH 104/272] dprint-plugins: disable automatic config discovery MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The opt‑out switch was added in dprint 0.50.0. --- pkgs/by-name/dp/dprint/plugins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/dp/dprint/plugins/default.nix b/pkgs/by-name/dp/dprint/plugins/default.nix index 94dc9db6819c..810d5d23481c 100644 --- a/pkgs/by-name/dp/dprint/plugins/default.nix +++ b/pkgs/by-name/dp/dprint/plugins/default.nix @@ -47,7 +47,7 @@ let runHook preInstallCheck mkdir empty && cd empty - dprint check --allow-no-files --plugins "$out/plugin.wasm" + dprint check --allow-no-files --config-discovery=false --plugins "$out/plugin.wasm" runHook postInstallCheck ''; From 26b6177f6fa08e6a0acbbe0045dfab00ed237bda Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 19 May 2025 10:47:11 +0900 Subject: [PATCH 105/272] dprint: prefer finalAttrs --- pkgs/by-name/dp/dprint/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix index fe27c3c1eed9..46dfd528d635 100644 --- a/pkgs/by-name/dp/dprint/package.nix +++ b/pkgs/by-name/dp/dprint/package.nix @@ -9,7 +9,7 @@ dprint, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "dprint"; version = "0.50.0"; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "dprint"; repo = "dprint"; - tag = version; + tag = finalAttrs.version; hash = "sha256-6AgbKH5f7N/yYqq7KBVHOqYbyuZkjFSaYwZwIXsgd9o="; }; @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { passthru = { tests.version = testers.testVersion { - inherit version; + inherit (finalAttrs) version; package = dprint; command = '' @@ -68,7 +68,7 @@ rustPlatform.buildRustPackage rec { It offers multiple WASM plugins to support various languages. It's written in Rust, so it’s small, fast, and portable. ''; - changelog = "https://github.com/dprint/dprint/releases/tag/${version}"; + changelog = "https://github.com/dprint/dprint/releases/tag/${finalAttrs.version}"; homepage = "https://dprint.dev"; license = licenses.mit; maintainers = with maintainers; [ @@ -78,4 +78,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "dprint"; }; -} +}) From 7f6c746f45a8dc0284189b6ac18c11be8dd16404 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 19 May 2025 10:43:15 +0900 Subject: [PATCH 106/272] dprint: remove unintended bin/test-process-plugin This test helper slipped in with commit c329f0625c80 but has never been needed by end users. --- pkgs/by-name/dp/dprint/package.nix | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix index 46dfd528d635..76da0cdd957b 100644 --- a/pkgs/by-name/dp/dprint/package.nix +++ b/pkgs/by-name/dp/dprint/package.nix @@ -30,6 +30,16 @@ rustPlatform.buildRustPackage (finalAttrs: { installShellFiles ]; + cargoBuildFlags = [ + "--package=dprint" + # Required only for dprint package tests; the binary is removed in postInstall. + "--package=test-process-plugin" + ]; + + cargoTestFlags = [ + "--package=dprint" + ]; + checkFlags = [ # Require creating directory and network access "--skip=plugins::cache_fs_locks::test" @@ -40,13 +50,17 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=utils::url::test::unsafe_ignore_cert" ]; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - export DPRINT_CACHE_DIR="$(mktemp -d)" - installShellCompletion --cmd dprint \ - --bash <($out/bin/dprint completions bash) \ - --zsh <($out/bin/dprint completions zsh) \ - --fish <($out/bin/dprint completions fish) - ''; + postInstall = + '' + rm "$out/bin/test-process-plugin" + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + export DPRINT_CACHE_DIR="$(mktemp -d)" + installShellCompletion --cmd dprint \ + --bash <($out/bin/dprint completions bash) \ + --zsh <($out/bin/dprint completions zsh) \ + --fish <($out/bin/dprint completions fish) + ''; passthru = { tests.version = testers.testVersion { From 36e296cb2787950a0c4e92720055411b6e20f61f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 02:24:13 +0000 Subject: [PATCH 107/272] 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 f1233a18eb124426d666efdba1894b30421235ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 02:30:06 +0000 Subject: [PATCH 108/272] boxflat: 1.30.0 -> 1.30.1 --- pkgs/by-name/bo/boxflat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bo/boxflat/package.nix b/pkgs/by-name/bo/boxflat/package.nix index 195165bacb38..e41ca1994904 100644 --- a/pkgs/by-name/bo/boxflat/package.nix +++ b/pkgs/by-name/bo/boxflat/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonPackage rec { pname = "boxflat"; - version = "1.30.0"; + version = "1.30.1"; pyproject = true; src = fetchFromGitHub { owner = "Lawstorant"; repo = "boxflat"; tag = "v${version}"; - hash = "sha256-6fzz3pq9fHoeGMT1Vz5Y8pKLdrprQEV5kLiZt7uJ1KI="; + hash = "sha256-5P6To0VRnvdu316bPIL7gDRuZLRjXLFbOpB9wZKs/t8="; }; build-system = [ python3Packages.setuptools ]; From 641789dbc5c102a90c1646818cda5b5682ff66b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 05:36:57 +0000 Subject: [PATCH 109/272] 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 110/272] 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 111/272] 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 65a759f7b46441ec2735950e476ed3a3c68a512f Mon Sep 17 00:00:00 2001 From: Fugi Date: Wed, 19 Feb 2025 17:58:52 +0100 Subject: [PATCH 112/272] nixos/gtklock: init --- .../manual/release-notes/rl-2511.section.md | 2 +- nixos/modules/module-list.nix | 1 + nixos/modules/programs/wayland/gtklock.nix | 78 +++++++++++++++++++ 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/programs/wayland/gtklock.nix diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index d0385c47644c..a396aa591703 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -10,7 +10,7 @@ -- Create the first release note entry in this section! +- [gtklock](https://github.com/jovanlanik/gtklock), a GTK-based lockscreen for Wayland. Available as [programs.gtklock](#opt-programs.gtklock.enable). ## Backward Incompatibilities {#sec-release-25.11-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 606eb5e7487f..07b5e7977683 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -331,6 +331,7 @@ ./programs/vivid.nix ./programs/wavemon.nix ./programs/wayland/cardboard.nix + ./programs/wayland/gtklock.nix ./programs/wayland/hyprland.nix ./programs/wayland/hyprlock.nix ./programs/wayland/labwc.nix diff --git a/nixos/modules/programs/wayland/gtklock.nix b/nixos/modules/programs/wayland/gtklock.nix new file mode 100644 index 000000000000..a3cef937ca83 --- /dev/null +++ b/nixos/modules/programs/wayland/gtklock.nix @@ -0,0 +1,78 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.gtklock; + configFormat = pkgs.formats.ini { + listToValue = builtins.concatStringsSep ";"; + }; + + inherit (lib) + types + mkOption + mkEnableOption + mkPackageOption + ; +in +{ + options.programs.gtklock = { + enable = mkEnableOption "gtklock, a GTK-based lockscreen for Wayland"; + + package = mkPackageOption pkgs "gtklock" { }; + + config = mkOption { + type = configFormat.type; + example = lib.literalExpression '' + { + main = { + idle-hide = true; + idle-timeout = 10; + }; + }''; + description = '' + Configuration for gtklock. + See [`gtklock(1)`](https://github.com/jovanlanik/gtklock/blob/master/man/gtklock.1.scd) man page for details. + ''; + }; + + style = mkOption { + type = with types; nullOr str; + default = null; + description = '' + CSS Stylesheet for gtklock. + See [gtklock's wiki](https://github.com/jovanlanik/gtklock/wiki#Styling) for details. + ''; + }; + + modules = mkOption { + type = with types; listOf package; + default = [ ]; + example = lib.literalExpression '' + with pkgs; [ + gtklock-playerctl-module + gtklock-powerbar-module + gtklock-userinfo-module + ]''; + description = "gtklock modules to load."; + }; + }; + + config = lib.mkIf cfg.enable { + programs.gtklock.config.main = { + style = lib.mkIf (cfg.style != null) "${pkgs.writeText "style.css" cfg.style}"; + + modules = lib.mkIf (cfg.modules != [ ]) ( + map (pkg: "${pkg}/lib/gtklock/${lib.removePrefix "gtklock-" pkg.pname}.so") cfg.modules + ); + }; + + environment.etc."xdg/gtklock/config.ini".source = configFormat.generate "config.ini" cfg.config; + + environment.systemPackages = [ cfg.package ]; + + security.pam.services.gtklock = { }; + }; +} From f13ffdd361d08f7a8bf0c61cdf853a2998f0c411 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 10:28:03 +0000 Subject: [PATCH 113/272] nchat: 5.6.7 -> 5.7.24 --- pkgs/by-name/nc/nchat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nc/nchat/package.nix b/pkgs/by-name/nc/nchat/package.nix index 1b27543b8270..2d8439b5cbad 100644 --- a/pkgs/by-name/nc/nchat/package.nix +++ b/pkgs/by-name/nc/nchat/package.nix @@ -15,13 +15,13 @@ }: let - version = "5.6.7"; + version = "5.7.24"; src = fetchFromGitHub { owner = "d99kris"; repo = "nchat"; tag = "v${version}"; - hash = "sha256-tHyNwTmpNRKsjjoX2RP1jk5wzn2xLgKE9KZXPo2Beco="; + hash = "sha256-qyx4LOhCFcwg2ou4QgiiolGgLs2fxfQu6gwDIeMUcb4="; }; libcgowm = buildGoModule { @@ -29,7 +29,7 @@ let inherit version src; sourceRoot = "${src.name}/lib/wmchat/go"; - vendorHash = "sha256-8q2156gYsKduzEKvxDTZJNzsxqcJr62bD4JNuJMR/Qc="; + vendorHash = "sha256-LPcIfXOlkejyLlYtew26FTOl7eBGhuNxjAVrmUItkxY="; buildPhase = '' runHook preBuild From 8bf7afa66d83f55591cc41e57768008085de5ef9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 11:23:52 +0000 Subject: [PATCH 114/272] satty: 0.18.0 -> 0.18.1 --- pkgs/by-name/sa/satty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix index 780e890559bf..7fa70a01419d 100644 --- a/pkgs/by-name/sa/satty/package.nix +++ b/pkgs/by-name/sa/satty/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "satty"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "gabm"; repo = "Satty"; rev = "v${version}"; - hash = "sha256-qsehxmx+iQKG70Es2I+G8hs4G56e/PuPPenNeEQ4sGQ="; + hash = "sha256-IqXzY4mccwVgRaq1TLr1dSyqSbIvClDyF6ahA6f5UP8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-VQ8BwEeDM9Dll6GIwXH2wHWwRKJxk3gTrxZ95pFaH4c="; + cargoHash = "sha256-xfRuEq7YgyYD9IvEzVAor/Iz4LUBUawDREXtqerDn6A="; nativeBuildInputs = [ copyDesktopItems From 7d7049b1e103171ecbb98beeec9549ed34c2d6b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 11:48:47 +0000 Subject: [PATCH 115/272] amd-libflame: 5.0 -> 5.1 --- pkgs/by-name/am/amd-libflame/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/am/amd-libflame/package.nix b/pkgs/by-name/am/amd-libflame/package.nix index d4828e66c4e9..8da26d47f60b 100644 --- a/pkgs/by-name/am/amd-libflame/package.nix +++ b/pkgs/by-name/am/amd-libflame/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "amd-libflame"; - version = "5.0"; + version = "5.1"; src = fetchFromGitHub { owner = "amd"; repo = "libflame"; rev = version; - hash = "sha256-Shsv5Zd59FN5tq1LY7QqPRtAHEysHIVbPeKIIZ/2eMw="; + hash = "sha256-9Z0e6RCJfqQlq3oT4fBu8rwPH1OWEKQ52rVDa0Y0rJU="; }; postPatch = '' From 2828a7357985fcc9d07fd4aa9d48e754a187c58b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 12:13:26 +0000 Subject: [PATCH 116/272] python3Packages.langchain-openai: 0.3.16 -> 0.3.17 --- pkgs/development/python-modules/langchain-openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix index 532d7079bed1..537520d435ee 100644 --- a/pkgs/development/python-modules/langchain-openai/default.nix +++ b/pkgs/development/python-modules/langchain-openai/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "langchain-openai"; - version = "0.3.16"; + version = "0.3.17"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-openai==${version}"; - hash = "sha256-e8y5rL+OUFOAPfXTC+XHn/wVfsecPInsS8hBxm1USAw="; + hash = "sha256-JsPdG62vvM8b/u5bo6FyXQhhGua/Sd74L/8CtMI7Fjc="; }; sourceRoot = "${src.name}/libs/partners/openai"; From 26b82c99abd1487c34bafe46115c6624a9de9833 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 19 May 2025 14:32:07 +0200 Subject: [PATCH 117/272] linux_testing: 6.15-rc6 -> 6.15-rc7 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 7c024a3fbabe..a2f3305bfdb9 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.15-rc6", - "hash": "sha256:1l18hsnzh28m2f34rsvq4khwblzl60qc61qs6ic13jbd8jsnhsi9" + "version": "6.15-rc7", + "hash": "sha256:0b9149pyg4lzzxqwx6sg8nz9ca1md7aijg9nrcagrq9sypl53hxn" }, "6.1": { "version": "6.1.139", From c3c0061572f64c40b0eb5d150d18c30ec20a0341 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 19 May 2025 14:32:50 +0200 Subject: [PATCH 118/272] linux-rt_5_10: 5.10.234-rt127 -> 5.10.237-rt131 --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index b5e18343a3e7..6bc23341acad 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -10,7 +10,7 @@ }@args: let - version = "5.10.234-rt127"; # updated by ./update-rt.sh + version = "5.10.237-rt131"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in @@ -25,7 +25,7 @@ buildLinux ( src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1rgb4v6dvqlw1mgzsli0hxaj2d5d4m1nylgcrwm4bkpiwbzc95wm"; + sha256 = "098gvqfaahabqqz64m5fwri57drwiz3006pr805sxw74w0vjgj0z"; }; kernelPatches = @@ -34,7 +34,7 @@ buildLinux ( name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1pmfba5sjmhai2hbzgbwhak46jhc45rcxf7zdgx5hbhbpgbl9d49"; + sha256 = "15f4dylrwm9q0dl3jhcy57611w5kzz74rf9aqfvh7cqxi5q4g8fs"; }; }; in From 9641b16352943ac119756dd0b044f8422134a07c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 19 May 2025 14:33:28 +0200 Subject: [PATCH 119/272] linux-rt_5_15: 5.15.177-rt83 -> 5.15.179-rt84 --- pkgs/os-specific/linux/kernel/linux-rt-5.15.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix index ec8816894f78..d7724c5d1046 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix @@ -10,7 +10,7 @@ }@args: let - version = "5.15.177-rt83"; # updated by ./update-rt.sh + version = "5.15.179-rt84"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in @@ -29,7 +29,7 @@ buildLinux ( src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1q56w3lqwi3ynny6z7siqzv3h8nryksyw70r3fhghca2il4bi7pa"; + sha256 = "0vqk4wd0cacigz42gigdzbj415hcdn2k2m01yr7k8pcv3rxs86ck"; }; kernelPatches = @@ -38,7 +38,7 @@ buildLinux ( name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1rc0cbc5jkgr3q3q2syqidak744lxcq3f5zdq6si2rsfxjz45www"; + sha256 = "0p2yq4ahv0rwynivvlldhalpw65ka6hmjxh26p3pi5qrv3rbwja1"; }; }; in From 61fbc69aef690e0f2569614bd2c7f4a5d0ea666a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 19 May 2025 14:33:57 +0200 Subject: [PATCH 120/272] linux-rt_6_1: 6.1.128-rt49 -> 6.1.134-rt51 --- pkgs/os-specific/linux/kernel/linux-rt-6.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix index 9b6afa18763d..6c6459e8b14e 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix @@ -10,7 +10,7 @@ }@args: let - version = "6.1.128-rt49"; # updated by ./update-rt.sh + version = "6.1.134-rt51"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in @@ -29,7 +29,7 @@ buildLinux ( src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "1wshgkgcxaf4mnm4ngngsj8gq1cg8kq56f5kqsdfcw0m339nfkc7"; + sha256 = "08xx0w5gz7w5hqsnpckmizi1zpg38iwfchj20163ivnxf3fhriv0"; }; kernelPatches = @@ -38,7 +38,7 @@ buildLinux ( name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1gyy9zwfcczy9v8790f06kaz7gg75a4cf4qpyjffqx3s21lwzbjf"; + sha256 = "18nznajrbjx9y76lki6aa10jkh33v60fnmyrbc0ds9x9xsnfahzz"; }; }; in From b6208691c09a6c527e3462ea8667eef81b5db913 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 19 May 2025 14:34:54 +0200 Subject: [PATCH 121/272] linux-rt_6_6: 6.6.77-rt50 -> 6.6.87-rt54 --- pkgs/os-specific/linux/kernel/linux-rt-6.6.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix index 7e217a23ea28..5a877d6c32fb 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix @@ -10,7 +10,7 @@ }@args: let - version = "6.6.77-rt50"; # updated by ./update-rt.sh + version = "6.6.87-rt54"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in @@ -29,7 +29,7 @@ buildLinux ( src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "0km855dnimg1clilnpcz293bd2gpbycvn3llm9kyynhjrzgqj408"; + sha256 = "1iks6msk4cajyy0khyhrwsdl123hr81n67xzdnhlgg6dvb1famw9"; }; kernelPatches = @@ -38,7 +38,7 @@ buildLinux ( name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "10kzns1c6yqn7az2i7zwm1lnss56mi6w44rw7xm2kk6n1h80590n"; + sha256 = "0qxfs10y1ndq346gvcmhv0a02bbd3804yn1hvpx3p7bjp91j2as6"; }; }; in From 5ff58f53b60dd7aa70e3e022662793de32e22115 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 19 May 2025 14:41:03 +0200 Subject: [PATCH 122/272] linux_latest-libre: 19769 -> 19792 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 119dbb34b6ab..3420af2b3188 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -5,8 +5,8 @@ linux, scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19769"; - sha256 = "0mfn2pa587laj45zlah424g953yjxmlh49x36byjylmzj079a42n"; + rev = "19792"; + sha256 = "1ygpb3i0m6zi2jhxl9kasf54blygsv7qh45nafv4shfk8bg80sn6"; }, ... }@args: From af90fa1c5e6e1786da4c9c236b03c5b5ce50bd20 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 19 May 2025 14:41:35 +0200 Subject: [PATCH 123/272] linux/hardened/patches/5.10: v5.10.235-hardened1 -> v5.10.237-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 87028b4d077f..063020957cad 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,12 +2,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.10.235-hardened1.patch", - "sha256": "1xhpwy62jbwbc71s2cglxhrn7radpp256v05d587gf7jwhbi2zmc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.235-hardened1/linux-hardened-v5.10.235-hardened1.patch" + "name": "linux-hardened-v5.10.237-hardened1.patch", + "sha256": "09a4dx65vn96s62viyhpjnz2hwcwxq8araxhk7x6ximyky888kmr", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.237-hardened1/linux-hardened-v5.10.237-hardened1.patch" }, - "sha256": "1k7iq4np3pflkq3d71ya8xs5czhslhy2iha4ls9lma81269y6fwm", - "version": "5.10.235" + "sha256": "098gvqfaahabqqz64m5fwri57drwiz3006pr805sxw74w0vjgj0z", + "version": "5.10.237" }, "5.15": { "patch": { From 993fa0f2556968c587d517841bd5945c930224da Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 19 May 2025 14:41:57 +0200 Subject: [PATCH 124/272] linux/hardened/patches/5.15: v5.15.179-hardened1 -> v5.15.182-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 063020957cad..1c1c83ea1a13 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,12 +12,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.15.179-hardened1.patch", - "sha256": "18255w5x7fjx37zdzbmigp641izc5h8fp2h8z7lj33z2mf7gfs9y", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.179-hardened1/linux-hardened-v5.15.179-hardened1.patch" + "name": "linux-hardened-v5.15.182-hardened1.patch", + "sha256": "1q6sm4542lb8zcgybxz9gjckvpll1nfyf87yqx9h5rn6a9mlwyl0", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.182-hardened1/linux-hardened-v5.15.182-hardened1.patch" }, - "sha256": "0vqk4wd0cacigz42gigdzbj415hcdn2k2m01yr7k8pcv3rxs86ck", - "version": "5.15.179" + "sha256": "07m3yrkqpmh4cmsmhz8i6da0h7xlprc7r4hb0xcy812s659zmaxn", + "version": "5.15.182" }, "5.4": { "patch": { From cbdbb6ea17d9ab909f45846754750b3260ca4943 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 19 May 2025 14:42:14 +0200 Subject: [PATCH 125/272] linux/hardened/patches/5.4: v5.4.291-hardened1 -> v5.4.293-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 1c1c83ea1a13..2747e5c44bb5 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.4.291-hardened1.patch", - "sha256": "1i7x7pdmqbrj306jbqv75ij1lq4hvdmw1qnfa4975zyzdd8d0khq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.291-hardened1/linux-hardened-v5.4.291-hardened1.patch" + "name": "linux-hardened-v5.4.293-hardened1.patch", + "sha256": "0wblrpmwp3rh1adyg1jbyifdfsdlm3p2mgw2xm9a03vwd0jkdd6f", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.293-hardened1/linux-hardened-v5.4.293-hardened1.patch" }, - "sha256": "0vpgb3lmhgv5iw9b1z0kqr6vdv44if49marfp5858z3a8yj69bdk", - "version": "5.4.291" + "sha256": "0b9p8l6ndm75751f7s03rnxg7yg9c4pj9rb537lhsv6pqx096n1l", + "version": "5.4.293" }, "6.1": { "patch": { From c44b873ebcf912085b0c1d95a88eb838e0ccfc7e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 19 May 2025 14:42:33 +0200 Subject: [PATCH 126/272] linux/hardened/patches/6.1: v6.1.131-hardened1 -> v6.1.138-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 2747e5c44bb5..dc21c103f777 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.1.131-hardened1.patch", - "sha256": "005qvy3r69cy007fvj7m4b49m3vplndb280p2q72wnk9mpw8axrp", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.131-hardened1/linux-hardened-v6.1.131-hardened1.patch" + "name": "linux-hardened-v6.1.138-hardened1.patch", + "sha256": "1llqkxp7kch0ryf6n658z06mv7a7igp0zpxcl3kiqysilm3f93nr", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.138-hardened1/linux-hardened-v6.1.138-hardened1.patch" }, - "sha256": "05jvvv3khadvfgdrv43fcrnm606jk4064a7qivkvnk1vc08gbjj4", - "version": "6.1.131" + "sha256": "04br4ln81skk4lgrgxqhpn2qjvkifi4bm360rfw9zfj9j2xsa6g3", + "version": "6.1.138" }, "6.12": { "patch": { From da5df08f081c61ddab032554815a12fd47a62331 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 19 May 2025 14:42:45 +0200 Subject: [PATCH 127/272] linux/hardened/patches/6.12: v6.12.19-hardened1 -> v6.12.28-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index dc21c103f777..68f510e31ace 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,12 +42,12 @@ "6.12": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.12.19-hardened1.patch", - "sha256": "1f78k1bns49gfb8ari5jg5wkfai206nfpsnwj0y5h5yrjg0x8sx8", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.19-hardened1/linux-hardened-v6.12.19-hardened1.patch" + "name": "linux-hardened-v6.12.28-hardened1.patch", + "sha256": "1l0r20i72p6x362a7i74qjrlf2c7yc92cgla7s1lflcb87yynnzl", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.28-hardened1/linux-hardened-v6.12.28-hardened1.patch" }, - "sha256": "0cb5ri6xsd9fyf0s48xrrsbhqzbgjd0iddnid6qk8i60prbz0fyp", - "version": "6.12.19" + "sha256": "07kpsl6lbsr0zw6p8bglgbchdrv1jivcwwnyh7vwzbk24lc9k878", + "version": "6.12.28" }, "6.13": { "patch": { From 0154bc329ff2d2c1e41daafaf5cc3f64bf9b0dfd Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 19 May 2025 14:43:03 +0200 Subject: [PATCH 128/272] linux/hardened/patches/6.13: v6.13.7-hardened1 -> v6.13.12-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 68f510e31ace..8826923a34cf 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,12 +52,12 @@ "6.13": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.13.7-hardened1.patch", - "sha256": "0s0h6z9qxqcfdz14zbaalapl2py7z40hf4p6405f2hy5hajdcxq3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.13.7-hardened1/linux-hardened-v6.13.7-hardened1.patch" + "name": "linux-hardened-v6.13.12-hardened1.patch", + "sha256": "0i9raq3qcc6pxvs9l6yn5b6k8kiywwlis33kkpd8byqhs57aqsic", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.13.12-hardened1/linux-hardened-v6.13.12-hardened1.patch" }, - "sha256": "07c08x68fgcsgriss5z8w427h69y52s887vas91jzb5p70hbcf9s", - "version": "6.13.7" + "sha256": "0hhj49k3ksjcp0dg5yiahqzryjfdpr9c1a9ph6j9slzmkikbn7v1", + "version": "6.13.12" }, "6.6": { "patch": { From e8581078a13f63278c8dadfcf7d44aeea0bc1dd8 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 18 May 2025 12:35:11 +0300 Subject: [PATCH 129/272] i18n: Add charset related settings Fixes #404758 --- doc/release-notes/rl-2505.section.md | 1 + nixos/modules/config/i18n.nix | 59 +++++++++++++++++++++------- 2 files changed, 45 insertions(+), 15 deletions(-) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index afa4d0e3474e..3c76ca687f6b 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -374,6 +374,7 @@ - `i18n.extraLocales` should now be the preferred way to install additional locales. - `i18n.supportedLocales` is now considered an implementation detail and will be hidden from the documentation. But the option will still continue to work. - `i18n.supportedLocales` will now trigger a warning when it omits any locale set in `i18n.defaultLocale`, `i18n.extraLocales` or `i18n.extraLocaleSettings`. + - The options `i18n.defaultCharset` & `i18n.localeCharsets` were added, and they complement `i18n.defaultLocale` & `i18n.extraLocaleSettings` respectively - allowing to control the character set used per locale setting. - `titaniumenv`, `titanium`, and `titanium-alloy` have been removed due to lack of maintenance in Nixpkgs []{#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed}. diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index 42b91ff9628a..02498dd15363 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -5,15 +5,21 @@ ... }: let + sanitizeUTF8Capitalization = + lang: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] lang); aggregatedLocales = - (builtins.map - (l: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") - ( - [ config.i18n.defaultLocale ] - ++ (lib.optionals (builtins.isList config.i18n.extraLocales) config.i18n.extraLocales) - ++ (lib.attrValues (lib.filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) - ) - ) + [ + "${config.i18n.defaultLocale}/${config.i18n.defaultCharset}" + ] + ++ lib.pipe config.i18n.extraLocaleSettings [ + # TODO: Explain why is this filter added here... + (lib.filterAttrs (n: v: n != "LANGUAGE")) + (lib.mapAttrs (n: v: (sanitizeUTF8Capitalization v))) + (lib.mapAttrsToList (LCRole: lang: lang + "/" + (config.i18n.localeCharsets.${LCRole} or "UTF-8"))) + ] + ++ (builtins.map sanitizeUTF8Capitalization ( + lib.optionals (builtins.isList config.i18n.extraLocales) config.i18n.extraLocales + )) ++ (lib.optional (builtins.isString config.i18n.extraLocales) config.i18n.extraLocales); in { @@ -48,16 +54,24 @@ in default = "en_US.UTF-8"; example = "nl_NL.UTF-8"; description = '' - The default locale. It determines the language for program - messages, the format for dates and times, sort order, and so on. - It also determines the character set, such as UTF-8. + The default locale. It determines the language for program messages, + the format for dates and times, sort order, and so on. Setting the + default character set is done via {option}`i18n.defaultCharset`. + ''; + }; + defaultCharset = lib.mkOption { + type = lib.types.str; + default = "UTF-8"; + example = "ISO-8859-8"; + description = '' + The default locale character set. ''; }; extraLocales = lib.mkOption { type = lib.types.either (lib.types.listOf lib.types.str) (lib.types.enum [ "all" ]); default = [ ]; - example = [ "nl_NL.UTF-8" ]; + example = [ "nl_NL.UTF-8/UTF-8" ]; description = '' Additional locales that the system should support, besides the ones configured with {option}`i18n.defaultLocale` and @@ -74,9 +88,24 @@ in LC_TIME = "de_DE.UTF-8"; }; description = '' - A set of additional system-wide locale settings other than - `LANG` which can be configured with - {option}`i18n.defaultLocale`. + A set of additional system-wide locale settings other than `LANG` + which can be configured with {option}`i18n.defaultLocale`. Note that + the `/UTF-8` suffix used in {option}`i18n.extraLocales` indicates a + character set, and it must not be added manually here. To use a + non-`UTF-8` character set such as ISO-XXXX-8, the + {option}`i18n.localeCharsets` can be used. + ''; + }; + localeCharsets = lib.mkOption { + type = lib.types.attrsOf lib.types.str; + default = { }; + example = { + LC_MESSAGES = "ISO-8859-15"; + LC_TIME = "ISO-8859-1"; + }; + description = '' + Per each {option}`i18n.extraLocaleSettings`, choose the character set + to use for it. Essentially defaults to UTF-8 for all of them. ''; }; From cbbd59e14e18f0aa98b2f4c962dfdeaf91d22785 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 18 May 2025 18:21:47 +0300 Subject: [PATCH 130/272] nixosTests.i18n: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/i18n.nix | 43 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 nixos/tests/i18n.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 41e7a6d35a97..410006a434ec 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -994,6 +994,7 @@ in orthanc = runTest ./orthanc.nix; owncast = handleTest ./owncast.nix { }; outline = handleTest ./outline.nix { }; + i18n = runTest ./i18n.nix; image-contents = handleTest ./image-contents.nix { }; openvscode-server = handleTest ./openvscode-server.nix { }; open-webui = runTest ./open-webui.nix; diff --git a/nixos/tests/i18n.nix b/nixos/tests/i18n.nix new file mode 100644 index 000000000000..a0493b7c62f5 --- /dev/null +++ b/nixos/tests/i18n.nix @@ -0,0 +1,43 @@ +{ lib, ... }: +{ + name = "glibLocales-custom-builds"; + meta.maintainers = with lib.maintainers; [ doronbehar ]; + + nodes = { + nonUTF8Charset = { + i18n = { + defaultLocale = "en_US"; + defaultCharset = "ISO-8859-1"; + }; + }; + extraLocales1 = { + i18n = { + defaultLocale = "en_US.UTF-8"; + extraLocales = [ + "nl_NL.UTF-8/UTF-8" + ]; + }; + }; + extraLocaleSettings = { + i18n = { + defaultLocale = "en_US.UTF-8"; + extraLocaleSettings = { + LC_MESSAGES = "en_US.UTF-8"; + LC_TIME = "de_DE.UTF-8"; + }; + }; + }; + localeCharsets = { + i18n = { + defaultLocale = "en_US.UTF-8"; + extraLocaleSettings = { + LC_TIME = "de_DE"; + }; + localeCharsets = { + LC_TIME = "ISO-8859-1"; + }; + }; + }; + }; + testScript = { nodes, ... }: ""; +} From 263297b4e5d3aa820be4b98e20e00a40e33aa4e7 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 18 May 2025 18:43:20 +0300 Subject: [PATCH 131/272] nixos/i18n: Remove special handling of LANGUAGE Partially revert #179194 which first filtered `extraLocaleSettings.LANGUAGE`. Indeed this environment variable is given precedence according to: https://www.gnu.org/software/gettext/manual/html_node/Locale-Environment-Variables.html So using it will simply make all other `extraLocaleSettings` be ignored in practice, but the OS shouldn't ignore it when aggregating the locales required in general, as this setup should still be legitimate, and it may even be useful if you wish to set it by default and use `env -u LANGUAGE` for some programs. --- nixos/modules/config/i18n.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index 02498dd15363..22a47d5bdffa 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -12,8 +12,6 @@ let "${config.i18n.defaultLocale}/${config.i18n.defaultCharset}" ] ++ lib.pipe config.i18n.extraLocaleSettings [ - # TODO: Explain why is this filter added here... - (lib.filterAttrs (n: v: n != "LANGUAGE")) (lib.mapAttrs (n: v: (sanitizeUTF8Capitalization v))) (lib.mapAttrsToList (LCRole: lang: lang + "/" + (config.i18n.localeCharsets.${LCRole} or "UTF-8"))) ] From 3aa3566fcace8d8fd269b98b1ee3dea0d09cc078 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 17:11:03 +0200 Subject: [PATCH 132/272] newt-go: init at 1.1.3 Tunneling client for Pangolin https://github.com/fosrl/newt --- pkgs/by-name/ne/newt-go/package.nix | 45 +++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/ne/newt-go/package.nix diff --git a/pkgs/by-name/ne/newt-go/package.nix b/pkgs/by-name/ne/newt-go/package.nix new file mode 100644 index 000000000000..6f86105d62f5 --- /dev/null +++ b/pkgs/by-name/ne/newt-go/package.nix @@ -0,0 +1,45 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, +}: + +buildGoModule rec { + pname = "newt"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "fosrl"; + repo = "newt"; + tag = version; + hash = "sha256-wfm2UI4QUiYiAJIYBiSCOD/w72WRJIv2cyLIkfqGsek="; + }; + + vendorHash = "sha256-8VlT9cy2uNhQPiUpr1jJuQSgUR6TtlbQ+etran2Htxs="; + + postPatch = '' + substituteInPlace main.go \ + --replace-fail "replaceme" "${version}" + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + ldflags = [ + "-s" + "-w" + ]; + + doInstallCheck = true; + + versionCheckProgramArg = [ "-version" ]; + + meta = { + description = "Tunneling client for Pangolin"; + homepage = "https://github.com/fosrl/newt"; + changelog = "https://github.com/fosrl/newt/releases/tag/${src.tag}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "newt"; + }; +} From ab41cf53350a837edec5891205b990f4d92c2ccf Mon Sep 17 00:00:00 2001 From: octvs Date: Mon, 19 May 2025 17:35:31 +0200 Subject: [PATCH 133/272] goimapnotify: 2.4 -> 2.5 --- pkgs/by-name/go/goimapnotify/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/goimapnotify/package.nix b/pkgs/by-name/go/goimapnotify/package.nix index 44ab2078d583..4bba2dcd3659 100644 --- a/pkgs/by-name/go/goimapnotify/package.nix +++ b/pkgs/by-name/go/goimapnotify/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "goimapnotify"; - version = "2.4"; + version = "2.5"; src = fetchFromGitLab { owner = "shackra"; repo = "goimapnotify"; rev = version; - hash = "sha256-ieaj97CjoSc/qt/JebATHmiJ7RIvNUpFZjEM6mqG9Rk="; + hash = "sha256-RHTOieuw4ZeM1hKHUobMIzAKQ2ZgqIaJMoemF6JY8Vg="; }; - vendorHash = "sha256-rWPXQj0XFS/Mv9ylGv09vol0kkRDNaOAEgnJvSWMvoI="; + vendorHash = "sha256-5cZzaCoOR1R7iST0q3GaJbYIbKKEigeWqhp87maOL04="; postPatch = '' for f in command.go command_test.go; do From 183015d5fa06cc9fbacf05739ac7bf55dc6753fd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 18:46:10 +0200 Subject: [PATCH 134/272] arp-scan-rs: mark as broken on darwin --- pkgs/by-name/ar/arp-scan-rs/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ar/arp-scan-rs/package.nix b/pkgs/by-name/ar/arp-scan-rs/package.nix index 946d12ae0189..adaa18ee35e6 100644 --- a/pkgs/by-name/ar/arp-scan-rs/package.nix +++ b/pkgs/by-name/ar/arp-scan-rs/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, fetchFromGitHub, gitUpdater, rustPlatform, @@ -18,6 +19,7 @@ rustPlatform.buildRustPackage rec { }; useFetchCargoVendor = true; + cargoHash = "sha256-lPE/mx4LzSOG1YjGol1f77oox4voZzp9RqrKYZAMoX0="; nativeInstallCheckInputs = [ versionCheckHook ]; @@ -43,5 +45,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "arp-scan"; + broken = stdenv.isDarwin; }; } From ae837ad0a62c7b7eea790ca4c946ed71c0e6a865 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 16:50:58 +0000 Subject: [PATCH 135/272] snac2: 2.75 -> 2.77 --- pkgs/by-name/sn/snac2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sn/snac2/package.nix b/pkgs/by-name/sn/snac2/package.nix index 25071e37eb37..81caa40570f8 100644 --- a/pkgs/by-name/sn/snac2/package.nix +++ b/pkgs/by-name/sn/snac2/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "snac2"; - version = "2.75"; + version = "2.77"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = "snac2"; tag = finalAttrs.version; - hash = "sha256-xy608ks9Z3eCjpE1M4U5r/Xi3ou8BuA4ljUDWgfTtoU="; + hash = "sha256-QUPFD7x1ZDnDxediA+oqYC8CotmGeAr36xSZ3STOK9Y="; }; buildInputs = [ From ed13d8a02f3b9be7b7bd99e358bfa63984f43e40 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 18:54:15 +0200 Subject: [PATCH 136/272] ares-rs: mark as broken on darwin --- pkgs/by-name/ar/ares-rs/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ar/ares-rs/package.nix b/pkgs/by-name/ar/ares-rs/package.nix index 21e41d5b1aa6..4e7ba2a2b08e 100644 --- a/pkgs/by-name/ar/ares-rs/package.nix +++ b/pkgs/by-name/ar/ares-rs/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, pkg-config, @@ -36,5 +37,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "ares"; + broken = stdenv.isDarwin; }; } From 676d2f074ed297c46db1aded226d8e91517020cb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 19:12:55 +0200 Subject: [PATCH 137/272] maigret: refactor --- pkgs/by-name/ma/maigret/package.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ma/maigret/package.nix b/pkgs/by-name/ma/maigret/package.nix index ec4f2103295b..02783588293e 100644 --- a/pkgs/by-name/ma/maigret/package.nix +++ b/pkgs/by-name/ma/maigret/package.nix @@ -9,11 +9,11 @@ python3.pkgs.buildPythonApplication rec { pname = "maigret"; version = "0.4.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "soxoj"; - repo = pname; + repo = "maigret"; tag = "v${version}"; hash = "sha256-Z8SnA7Z5+oKW0AOaNf+c/zR30lrPFmXaxxKkbnDXNNs="; }; @@ -27,7 +27,9 @@ python3.pkgs.buildPythonApplication rec { }) ]; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ aiodns aiohttp aiohttp-socks @@ -68,8 +70,6 @@ python3.pkgs.buildPythonApplication rec { yarl ]; - __darwinAllowLocalNetworking = true; - nativeCheckInputs = with python3.pkgs; [ pytest-httpserver pytest-asyncio @@ -77,6 +77,7 @@ python3.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = true; + pythonRemoveDeps = [ "future-annotations" ]; pytestFlagsArray = [ @@ -100,14 +101,12 @@ python3.pkgs.buildPythonApplication rec { "test_asyncio_progressbar_executor" ]; - pythonImportsCheck = [ - "maigret" - ]; + pythonImportsCheck = [ "maigret" ]; meta = with lib; { description = "Tool to collect details about an username"; homepage = "https://maigret.readthedocs.io"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From f218242aa97ec50563b6c8d39aba72edd5881032 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 19:13:40 +0200 Subject: [PATCH 138/272] maigret: mark as broken on darwin --- pkgs/by-name/ma/maigret/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ma/maigret/package.nix b/pkgs/by-name/ma/maigret/package.nix index 02783588293e..cdea13a209a5 100644 --- a/pkgs/by-name/ma/maigret/package.nix +++ b/pkgs/by-name/ma/maigret/package.nix @@ -108,5 +108,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://maigret.readthedocs.io"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + broken = stdenv.hostPlatform.isDarwin; }; } From b9709f944d6526ad6981c0ab99d960fa62ac34b8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 19:16:00 +0200 Subject: [PATCH 139/272] azurehound: disable on darwin --- pkgs/by-name/az/azurehound/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix index 4f33e7fff921..a2ec96104bb7 100644 --- a/pkgs/by-name/az/azurehound/package.nix +++ b/pkgs/by-name/az/azurehound/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, versionCheckHook, @@ -37,5 +38,6 @@ buildGoModule rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "azurehound"; + broken = stdenv.hostPlatform.isDarwin; }; } From abfa1df8d341e6ab3862f8ebd613ff2613d7f701 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 19:19:24 +0200 Subject: [PATCH 140/272] dnstake: refactor --- pkgs/by-name/dn/dnstake/package.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/dn/dnstake/package.nix b/pkgs/by-name/dn/dnstake/package.nix index 21d922961273..9bd1853aa410 100644 --- a/pkgs/by-name/dn/dnstake/package.nix +++ b/pkgs/by-name/dn/dnstake/package.nix @@ -2,7 +2,6 @@ lib, buildGoModule, fetchFromGitHub, - fetchpatch, }: buildGoModule rec { @@ -11,26 +10,18 @@ buildGoModule rec { src = fetchFromGitHub { owner = "pwnesia"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-k6j7DIwK8YAKmEjn8JJO7XBcap9ui6cgUSJG7CeHAAM="; + repo = "dnstake"; + tag = "v${version}"; + hash = "sha256-k6j7DIwK8YAKmEjn8JJO7XBcap9ui6cgUSJG7CeHAAM="; }; - patches = [ - # https://github.com/pwnesia/dnstake/pull/36 - (fetchpatch { - name = "update-x-sys-fix-darwin.patch"; - url = "https://github.com/pwnesia/dnstake/commit/974efbbff4ce26d2f2646ca2ceb1316c131cefbe.patch"; - sha256 = "sha256-fLOGF8damdLROd8T0fH/FGSVX23dtc+yHhSvVCwVeuY="; - }) - ]; - vendorHash = "sha256-lV6dUl+OMUQfhlgNL38k0Re1Mr3VP9b8SI3vTJ8CP18="; meta = with lib; { description = "Tool to check missing hosted DNS zones"; homepage = "https://github.com/pwnesia/dnstake"; - license = with licenses; [ mit ]; + changelog = "https://github.com/pwnesia/dnstake/releases/tag/${src.tag}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "dnstake"; }; From 28422dbcc97efd82ebd5b0d645fa7dfd4fadfbc1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 19:20:02 +0200 Subject: [PATCH 141/272] dnstake: mark as broken on darwin --- pkgs/by-name/dn/dnstake/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/dn/dnstake/package.nix b/pkgs/by-name/dn/dnstake/package.nix index 9bd1853aa410..e48d7e3ca11d 100644 --- a/pkgs/by-name/dn/dnstake/package.nix +++ b/pkgs/by-name/dn/dnstake/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, }: @@ -24,5 +25,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "dnstake"; + broken = stdenv.hostPlatform.isDarwin; }; } From 85cd98223fd1907300b506c16572d834b0510505 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 19:23:21 +0200 Subject: [PATCH 142/272] mx-takeover: refactor --- pkgs/by-name/mx/mx-takeover/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mx/mx-takeover/package.nix b/pkgs/by-name/mx/mx-takeover/package.nix index a0df42942b33..8a433ffd8689 100644 --- a/pkgs/by-name/mx/mx-takeover/package.nix +++ b/pkgs/by-name/mx/mx-takeover/package.nix @@ -24,10 +24,10 @@ buildGoModule rec { meta = with lib; { description = "Tool to work with DNS MX records"; - mainProgram = "mx-takeover"; homepage = "https://github.com/musana/mx-takeover"; - changelog = "https://github.com/musana/mx-takeover/releases/tag/v${version}"; + changelog = "https://github.com/musana/mx-takeover/releases/tag/v${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "mx-takeover"; }; } From c0c54903b13d20a1590abc1963f4a4fd0e24fdef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 19:24:42 +0200 Subject: [PATCH 143/272] mx-takeover: disable on darwin --- pkgs/by-name/mx/mx-takeover/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/mx/mx-takeover/package.nix b/pkgs/by-name/mx/mx-takeover/package.nix index 8a433ffd8689..d3e54e541cc6 100644 --- a/pkgs/by-name/mx/mx-takeover/package.nix +++ b/pkgs/by-name/mx/mx-takeover/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, }: @@ -29,5 +30,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "mx-takeover"; + broken = stdenv.hostPlatform.isDarwin; }; } From c940e6d868134f7a2946572193e76c0d91ee9e31 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 19:26:33 +0200 Subject: [PATCH 144/272] unicorn-angr: mark as broken on darwin --- pkgs/by-name/un/unicorn-angr/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/un/unicorn-angr/package.nix b/pkgs/by-name/un/unicorn-angr/package.nix index 18711fc7c8a4..d85ac29a12d2 100644 --- a/pkgs/by-name/un/unicorn-angr/package.nix +++ b/pkgs/by-name/un/unicorn-angr/package.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ fab ]; platforms = platforms.unix; + broken = stdenv.hostPlatform.isDarwin; }; } From f6d2a400a0ab68d15391ba73d3e1ff0df3054f64 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 19:27:36 +0200 Subject: [PATCH 145/272] poutine: mark as broken on darwin --- pkgs/by-name/po/poutine/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/po/poutine/package.nix b/pkgs/by-name/po/poutine/package.nix index 1f26e7836301..7dec487e37a2 100644 --- a/pkgs/by-name/po/poutine/package.nix +++ b/pkgs/by-name/po/poutine/package.nix @@ -40,5 +40,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ fab ]; mainProgram = "poutine"; + broken = stdenv.hostPlatform.isDarwin; }; } From 51f6d18c054780f0f4b5efd0291bbc084066b5be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 19:31:38 +0200 Subject: [PATCH 146/272] deepsecrets: refactor --- pkgs/tools/security/deepsecrets/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/security/deepsecrets/default.nix b/pkgs/tools/security/deepsecrets/default.nix index 1238d51b23bc..d0a7813e2eba 100644 --- a/pkgs/tools/security/deepsecrets/default.nix +++ b/pkgs/tools/security/deepsecrets/default.nix @@ -22,9 +22,7 @@ python3.pkgs.buildPythonApplication rec { "mmh3" ]; - build-system = with python3.pkgs; [ - poetry-core - ]; + build-system = with python3.pkgs; [ poetry-core ]; dependencies = with python3.pkgs; [ dotwiz @@ -36,13 +34,7 @@ python3.pkgs.buildPythonApplication rec { regex ]; - pythonImportsCheck = [ - "deepsecrets" - ]; - - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; disabledTests = [ # assumes package is built in /app (docker?), and not /build/${src.name} (nix sandbox) @@ -51,12 +43,14 @@ python3.pkgs.buildPythonApplication rec { "test_basic_info" ]; + pythonImportsCheck = [ "deepsecrets" ]; + meta = { description = "Secrets scanner that understands code"; - mainProgram = "deepsecrets"; homepage = "https://github.com/avito-tech/deepsecrets"; changelog = "https://github.com/avito-tech/deepsecrets/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; + mainProgram = "deepsecrets"; }; } From 075f82fe32291acc1d434152f094478dd83f4d2e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 19:32:07 +0200 Subject: [PATCH 147/272] deepsecrets: mark as broekn on darwin --- pkgs/tools/security/deepsecrets/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/deepsecrets/default.nix b/pkgs/tools/security/deepsecrets/default.nix index d0a7813e2eba..7936c303b7e0 100644 --- a/pkgs/tools/security/deepsecrets/default.nix +++ b/pkgs/tools/security/deepsecrets/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, python3, fetchFromGitHub, }: @@ -52,5 +53,6 @@ python3.pkgs.buildPythonApplication rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "deepsecrets"; + broken = stdenv.hostPlatform.isDarwin; }; } From 4bd954bba190589c5155ec92f690633014f3560c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 19:33:16 +0200 Subject: [PATCH 148/272] donpapi: refactor --- pkgs/by-name/do/donpapi/package.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/do/donpapi/package.nix b/pkgs/by-name/do/donpapi/package.nix index 8a90402c0276..b6d201ebfe67 100644 --- a/pkgs/by-name/do/donpapi/package.nix +++ b/pkgs/by-name/do/donpapi/package.nix @@ -22,11 +22,9 @@ python3.pkgs.buildPythonApplication rec { "pyasn1" ]; - nativeBuildInputs = with python3.pkgs; [ - poetry-core - ]; + build-system = with python3.pkgs; [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ cryptography impacket lnkparse3 @@ -38,14 +36,12 @@ python3.pkgs.buildPythonApplication rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ - "donpapi" - ]; + pythonImportsCheck = [ "donpapi" ]; meta = with lib; { description = "Tool for dumping DPAPI credentials remotely"; homepage = "https://github.com/login-securite/DonPAPI"; - changelog = "https://github.com/login-securite/DonPAPI/releases/tag/V${version}"; + changelog = "https://github.com/login-securite/DonPAPI/releases/tag/V${src.tag}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; mainProgram = "donpapi"; From d073665f0454867c49c7ca3fddf4b0047794b8bb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 19:33:52 +0200 Subject: [PATCH 149/272] donpapi: mark as broken on darwin --- pkgs/by-name/do/donpapi/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/do/donpapi/package.nix b/pkgs/by-name/do/donpapi/package.nix index b6d201ebfe67..0d3e0b29ef2c 100644 --- a/pkgs/by-name/do/donpapi/package.nix +++ b/pkgs/by-name/do/donpapi/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, python3, fetchFromGitHub, }: @@ -45,5 +46,6 @@ python3.pkgs.buildPythonApplication rec { license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; mainProgram = "donpapi"; + broken = stdenv.hostPlatform.isDarwin; }; } From c2a54f0803c216b4e8716b620d49d9873954ffd5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 18:19:44 +0000 Subject: [PATCH 150/272] ast-grep: 0.37.0 -> 0.38.2 --- pkgs/by-name/as/ast-grep/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index ec8b4841a401..4783207b3a6f 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ast-grep"; - version = "0.37.0"; + version = "0.38.2"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; tag = finalAttrs.version; - hash = "sha256-X2FTIyvpz4nEBc7zrPNAq/yTdOlVupwSoDQzvZGDjo8="; + hash = "sha256-mUqjD/otB891kJ8aIF3NP9ewo7yAuGE3yPK+gIIrm2w="; }; # error: linker `aarch64-linux-gnu-gcc` not found @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-0PUXj9LSFFC10H3LHVuiOHCREwFz8AkgkzJDUAGI+V0="; + cargoHash = "sha256-s2h2Zt0cRW6V0VAKNuTL8WkHdfkLvuZA/bnSkQKcr9w="; nativeBuildInputs = [ installShellFiles ]; From f969f27fa5980f4406b66d52987953cf1e9cf60e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 20:39:16 +0200 Subject: [PATCH 151/272] routersploit: unstable-2021-02-06 -> 3.4.1-unstable-2025-04-24 --- pkgs/by-name/ro/routersploit/package.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ro/routersploit/package.nix b/pkgs/by-name/ro/routersploit/package.nix index 0ff779a6de1d..1bb8da28873a 100644 --- a/pkgs/by-name/ro/routersploit/package.nix +++ b/pkgs/by-name/ro/routersploit/package.nix @@ -6,25 +6,31 @@ python3.pkgs.buildPythonApplication rec { pname = "routersploit"; - version = "unstable-2021-02-06"; - format = "setuptools"; + version = "3.4.1-unstable-2025-04-24"; + pyproject = true; src = fetchFromGitHub { owner = "threat9"; - repo = pname; - rev = "3fd394637f5566c4cf6369eecae08c4d27f93cda"; + repo = "routersploit"; + rev = "0bf837f67ed2131077c4192c21909104aab9f13d"; hash = "sha256-IET0vL0VVP9ZNn75hKdTCiEmOZRHHYICykhzW2g3LEg="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ future paramiko pycryptodome pysnmp requests setuptools + standard-telnetlib ]; + # Tests are out-dated and support for newer pysnmp is not implemented yet + doCheck = false; + nativeCheckInputs = with python3.pkgs; [ pytest-xdist pytestCheckHook @@ -35,9 +41,7 @@ python3.pkgs.buildPythonApplication rec { mv $out/bin/rsf.py $out/bin/rsf ''; - pythonImportsCheck = [ - "routersploit" - ]; + pythonImportsCheck = [ "routersploit" ]; pytestFlagsArray = [ # Run the same tests as upstream does in the first round @@ -49,7 +53,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Exploitation Framework for Embedded Devices"; homepage = "https://github.com/threat9/routersploit"; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainers = with maintainers; [ fab ]; mainProgram = "rsf"; }; From e191bd4f41689bae90a359d1576d5915e67eabd1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 20:51:11 +0200 Subject: [PATCH 152/272] python313Packages.atenpdu: mark as broken for pysnmp < 7 --- pkgs/development/python-modules/atenpdu/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix index b34b1c46c1ad..0ab5b86e94c9 100644 --- a/pkgs/development/python-modules/atenpdu/default.nix +++ b/pkgs/development/python-modules/atenpdu/default.nix @@ -39,5 +39,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "pductl"; + broken = versionAtLeast pysnmp.version "7"; }; } From a110cfd998ccbfc9d3ae71b4b096311e8a4e7ba5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 21:02:11 +0200 Subject: [PATCH 153/272] Revert "python3Packages.webexteamssdk: 1.6.1 -> 2.0.3" This reverts commit 2056bbcdcd6a6a163750e198d9f856008beff458. --- pkgs/development/python-modules/webexteamssdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix index d534568d3714..87c07b5e5396 100644 --- a/pkgs/development/python-modules/webexteamssdk/default.nix +++ b/pkgs/development/python-modules/webexteamssdk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "webexteamssdk"; - version = "2.0.3"; + version = "1.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "CiscoDevNet"; repo = "webexteamssdk"; tag = "v${version}"; - hash = "sha256-E66LwqzNWYAxnB8y5t8JHH4oVVXvheO7tteHWqrRRt8="; + hash = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo="; }; postPatch = '' @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for Webex Teams APIs"; homepage = "https://github.com/CiscoDevNet/webexteamssdk"; - changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/${src.tag}"; + changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 5592fde390ef178da2d4ecadda6fd3cb34e0a9e2 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Mon, 19 May 2025 11:56:24 -0700 Subject: [PATCH 154/272] 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 c76611337b7a260980c58022c933abbe4d11d6b6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 21:08:22 +0200 Subject: [PATCH 155/272] python313Packages.webexteamssdk: disable bulk updates --- pkgs/development/python-modules/webexteamssdk/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix index 87c07b5e5396..137ce28a034e 100644 --- a/pkgs/development/python-modules/webexteamssdk/default.nix +++ b/pkgs/development/python-modules/webexteamssdk/default.nix @@ -25,6 +25,10 @@ buildPythonPackage rec { hash = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo="; }; + # opsdroid still depends on webexteamssdk but package was renamed + # to webexpythonsdk + passthru.skipBulkUpdate = true; + postPatch = '' # Remove vendorized versioneer rm versioneer.py From b910f2a72f6da1b61aab3d22b5cc6b6d635cd706 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 21:14:11 +0200 Subject: [PATCH 156/272] librespeed-cli: refactor --- pkgs/by-name/li/librespeed-cli/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/librespeed-cli/package.nix b/pkgs/by-name/li/librespeed-cli/package.nix index 627686d58d1b..d06c44bbc0a2 100644 --- a/pkgs/by-name/li/librespeed-cli/package.nix +++ b/pkgs/by-name/li/librespeed-cli/package.nix @@ -11,8 +11,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "librespeed"; repo = "speedtest-cli"; - rev = "v${version}"; - sha256 = "sha256-LFGlKYWUaHi/byoRPD6zsdr0U5r0zWxxRa2NJNB2yb8="; + tag = "v${version}"; + hash = "sha256-LFGlKYWUaHi/byoRPD6zsdr0U5r0zWxxRa2NJNB2yb8="; }; vendorHash = "sha256-psZyyySpY06J+ji+9uHUtX7Ks1hzZC3zINszYP75NfQ="; @@ -23,7 +23,8 @@ buildGoModule rec { meta = with lib; { description = "Command line client for LibreSpeed"; homepage = "https://github.com/librespeed/speedtest-cli"; - license = with licenses; [ lgpl3Only ]; + changelog = "https://github.com/librespeed/speedtest-cli/releases/tag/${src.tag}"; + license = licenses.lgpl3Only; maintainers = with maintainers; [ fab ]; mainProgram = "speedtest-cli"; }; From a1108763e04bf9fd84369425ee2886a013fec239 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 21:21:31 +0200 Subject: [PATCH 157/272] librespeed-cli: mark as broken on darwin --- pkgs/by-name/li/librespeed-cli/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/li/librespeed-cli/package.nix b/pkgs/by-name/li/librespeed-cli/package.nix index d06c44bbc0a2..893183bee5d8 100644 --- a/pkgs/by-name/li/librespeed-cli/package.nix +++ b/pkgs/by-name/li/librespeed-cli/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, }: @@ -27,5 +28,6 @@ buildGoModule rec { license = licenses.lgpl3Only; maintainers = with maintainers; [ fab ]; mainProgram = "speedtest-cli"; + broken = stdenv.hostPlatform.isDarwin; }; } From 49d7fea2bb56de1d2c717cfc41261d6e61b13d21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 19:33:14 +0000 Subject: [PATCH 158/272] 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 ffb63b26475d1e5a633d24f620d004c04d2a9285 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 20:00:33 +0000 Subject: [PATCH 159/272] frankenphp: 1.5.0 -> 1.6.0 --- pkgs/by-name/fr/frankenphp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix index 0ff5e14d3ec0..df45651ae04a 100644 --- a/pkgs/by-name/fr/frankenphp/package.nix +++ b/pkgs/by-name/fr/frankenphp/package.nix @@ -31,13 +31,13 @@ let in buildGoModule rec { pname = "frankenphp"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "dunglas"; repo = "frankenphp"; tag = "v${version}"; - hash = "sha256-VOvH4Ma7IRDL2U6ihC620g9hvBcbt4VKP9SQxV1n3RM="; + hash = "sha256-y1S1oPBuXpu2ApCxv9ENqzD2wjSeMzwqnBldmVLEIsM="; }; sourceRoot = "${src.name}/caddy"; @@ -45,7 +45,7 @@ buildGoModule rec { # frankenphp requires C code that would be removed with `go mod tidy` # https://github.com/golang/go/issues/26366 proxyVendor = true; - vendorHash = "sha256-ltT6RHGcEMJjCkqWWwtVrCUpPs2F8U0yBx+YbzGwfSo="; + vendorHash = "sha256-M1z9Yv+WomKA+UACOUT8xcWdw+SD1MY2jfaDO4zYUQg="; buildInputs = [ phpUnwrapped From 560e00c88bbede14cafeb0660d1140a6826c8167 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 22:04:31 +0200 Subject: [PATCH 160/272] python313Packages.iterfzf: 1.6.0.60.3 -> 1.8.0.62.0 Diff: https://github.com/dahlia/iterfzf/compare/refs/tags/1.6.0.60.3...refs/tags/1.8.0.62.0 Changelog: https://github.com/dahlia/iterfzf/releases/tag/1.8.0.62.0 --- pkgs/development/python-modules/iterfzf/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/iterfzf/default.nix b/pkgs/development/python-modules/iterfzf/default.nix index 83b6cb5c0077..ab25c02a5852 100644 --- a/pkgs/development/python-modules/iterfzf/default.nix +++ b/pkgs/development/python-modules/iterfzf/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "iterfzf"; - version = "1.6.0.60.3"; + version = "1.8.0.62.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "dahlia"; repo = "iterfzf"; tag = version; - hash = "sha256-M6ri90GNHOmr0HtQ/tGxqpG7f+D5rsH/SAlbaVtmTwU="; + hash = "sha256-eLgF+9p+sqxWR1VkSoeL0NPDMamzUYbql4gMeG8fyNY="; }; postPatch = '' @@ -53,11 +53,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "iterfzf" ]; - meta = with lib; { + meta = { description = "Pythonic interface to fzf, a CLI fuzzy finder"; homepage = "https://github.com/dahlia/iterfzf"; changelog = "https://github.com/dahlia/iterfzf/releases/tag/${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; + platforms = lib.platforms.unix; }; } From b096c95f51397375a852b7db4e66f02119cb04c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 22:25:08 +0200 Subject: [PATCH 161/272] python313Packages.turrishw: fix changelog entry --- pkgs/development/python-modules/turrishw/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/turrishw/default.nix b/pkgs/development/python-modules/turrishw/default.nix index 014c7b83f851..5fa6fad67804 100644 --- a/pkgs/development/python-modules/turrishw/default.nix +++ b/pkgs/development/python-modules/turrishw/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = { description = "Python library and program for Turris hardware listing"; homepage = "https://github.com/turris-cz/turrishw"; - changelog = "https://github.com/turris-cz/turrishw/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/turris-cz/turrishw/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; From cb6f5a6d1ab55f39c598428b97fe3ee0bddc52da Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 22:38:23 +0200 Subject: [PATCH 162/272] python313Packages.turrishw: disable tests on darwin --- pkgs/development/python-modules/turrishw/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/turrishw/default.nix b/pkgs/development/python-modules/turrishw/default.nix index 5fa6fad67804..8f5378f6ef4e 100644 --- a/pkgs/development/python-modules/turrishw/default.nix +++ b/pkgs/development/python-modules/turrishw/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, hatchling, @@ -25,6 +26,9 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + # Tests don't work on darwin + doCheck = !stdenv.hostPlatform.isDarwin; + pythonImportsCheck = [ "turrishw" ]; meta = { From 9943b72807196b1ec7eee942adc010fbabd4cf44 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 May 2025 22:47:46 +0200 Subject: [PATCH 163/272] python313Packages.pystatgrab: disable tests on darwin (seg fault) --- .../python-modules/pystatgrab/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pystatgrab/default.nix b/pkgs/development/python-modules/pystatgrab/default.nix index 620552507729..904de7a783ca 100644 --- a/pkgs/development/python-modules/pystatgrab/default.nix +++ b/pkgs/development/python-modules/pystatgrab/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, cython, fetchFromGitHub, @@ -8,7 +9,6 @@ pythonOlder, setuptools, unittestCheckHook, - wheel, }: buildPythonPackage rec { @@ -25,24 +25,22 @@ buildPythonPackage rec { hash = "sha256-0FDhkIK8jy3/SFmCzrl9l4RTeIKDjO0o5UoODx6Wnfs="; }; - build-system = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; nativeBuildInputs = [ cython pkg-config ]; - buildInputs = [ - libstatgrab - ]; + buildInputs = [ libstatgrab ]; nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "statgrab" ]; + # Tests don't work on darwin due to seg fault + doCheck = !stdenv.hostPlatform.isDarwin; + meta = with lib; { description = "Python bindings for libstatgrab"; homepage = "https://github.com/libstatgrab/pystatgrab"; From ba16e85369c4c676ec352379550b091c8a0724c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 21:13:01 +0000 Subject: [PATCH 164/272] vscode-extensions.ionide.ionide-fsharp: 7.25.8 -> 7.25.10 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 7ab8e0702496..33b6b2842328 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2514,8 +2514,8 @@ let mktplcRef = { name = "Ionide-fsharp"; publisher = "Ionide"; - version = "7.25.8"; - hash = "sha256-/pnLLFj6Iwn14GLGbuc2Ex7IbNmXFiH1Btd12cCGGes="; + version = "7.25.10"; + hash = "sha256-2d12itLc9qBZZ7nQNS/80K46dde2RUKpkWgPwFxogIs="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog"; From 694d2cde42f9f74ab590b995d7f1f531af7fd7ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 22:15:15 +0000 Subject: [PATCH 165/272] libretro.ppsspp: 0-unstable-2025-05-08 -> 0-unstable-2025-05-19 --- pkgs/applications/emulators/libretro/cores/ppsspp.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix index bba394dbf91e..37875157ab64 100644 --- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix +++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix @@ -13,13 +13,13 @@ }: mkLibretroCore { core = "ppsspp"; - version = "0-unstable-2025-05-08"; + version = "0-unstable-2025-05-19"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; - rev = "732d05c2c136856a3f173574233a2431a015a6f5"; - hash = "sha256-5PVN8qG0ONsro6jH/8rAIma+4DlKAUoS/6aUPqBqbe4="; + rev = "48852ed81dbfb4b502a45eb632d4f999a892cc72"; + hash = "sha256-XgYu36byAxXTDsgq4Iz+VPWQNsPxXQP+hx+/MYZkm6k="; fetchSubmodules = true; }; From 517cde4cff6e1df04596ef592ac2dbdb9bef469c Mon Sep 17 00:00:00 2001 From: Maxime Brunet Date: Mon, 19 May 2025 19:43:17 -0300 Subject: [PATCH 166/272] vectorcode: install shell completions --- pkgs/by-name/ve/vectorcode/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/ve/vectorcode/package.nix b/pkgs/by-name/ve/vectorcode/package.nix index 7c86b426cec2..2a422966a661 100644 --- a/pkgs/by-name/ve/vectorcode/package.nix +++ b/pkgs/by-name/ve/vectorcode/package.nix @@ -2,6 +2,7 @@ lib, python3Packages, fetchFromGitHub, + installShellFiles, versionCheckHook, lspSupport ? true, @@ -63,10 +64,17 @@ python3Packages.buildPythonApplication rec { ]; }; + postInstall = '' + $out/bin/vectorcode --print-completion=bash >vectorcode.bash + $out/bin/vectorcode --print-completion=zsh >vectorcode.zsh + installShellCompletion vectorcode.{bash,zsh} + ''; + pythonImportsCheck = [ "vectorcode" ]; nativeCheckInputs = [ + installShellFiles versionCheckHook ] ++ (with python3Packages; [ From 65888ccba939931820b31123e890bcafabddb41f Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 18 May 2025 01:01:52 +0200 Subject: [PATCH 167/272] geteduroam: init at 0.10 --- pkgs/by-name/ge/geteduroam/package.nix | 92 ++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 pkgs/by-name/ge/geteduroam/package.nix diff --git a/pkgs/by-name/ge/geteduroam/package.nix b/pkgs/by-name/ge/geteduroam/package.nix new file mode 100644 index 000000000000..626c641dc66a --- /dev/null +++ b/pkgs/by-name/ge/geteduroam/package.nix @@ -0,0 +1,92 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + symlinkJoin, + versionCheckHook, + makeWrapper, + wrapGAppsHook4, + cairo, + gdk-pixbuf, + glib, + graphene, + gtk4, + libadwaita, + pango, +}: + +buildGoModule (finalAttrs: { + pname = "geteduroam"; + version = "0.10"; + + src = fetchFromGitHub { + owner = "geteduroam"; + repo = "linux-app"; + tag = finalAttrs.version; + hash = "sha256-Mtzt6i8vJ5M8T0vrAOxXhawlhCmCMEnDQz0Jo6uV88A="; + }; + + vendorHash = "sha256-b06wnqT88J7etNTFJ6nE9Uo0gOQOGvvs0vPNnJr6r4Q="; + + subPackages = [ + "cmd/geteduroam-gui" + "cmd/geteduroam-notifcheck" + ]; + + postInstall = '' + wrapProgram $out/bin/geteduroam-gui \ + --set-default PUREGOTK_LIB_FOLDER ${finalAttrs.passthru.libraryPath}/lib \ + ''${gappsWrapperArgs[@]} + + # copy notifcheck service + mkdir -p $out/lib/systemd/system/ + cp -v systemd/user/geteduroam/* $out/lib/systemd/system/ + substituteInPlace $out/lib/systemd/system/geteduroam-notifs.service \ + --replace-fail \ + "ExecStart=/usr/bin/geteduroam-notifcheck" \ + "ExecStart=$out/bin/geteduroam-notifcheck" + + # copy icons and desktop entries + cp -r cmd/geteduroam-gui/resources/share $out/ + ''; + + nativeBuildInputs = [ + wrapGAppsHook4 + makeWrapper + ]; + + dontWrapGApps = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/geteduroam-gui"; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru = { + libraryPath = symlinkJoin { + name = "eduroam-gui-puregotk-lib"; + # based on https://github.com/jwijenbergh/puregotk/blob/bc1a52f44fd4c491947f7af85296c66173da17ba/internal/core/core.go#L41 + paths = [ + cairo + gdk-pixbuf + glib.out + graphene + gtk4 + libadwaita + pango.out + ]; + }; + }; + + meta = { + description = "GUI client to configure eduroam"; + homepage = "https://eduroam.app"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ pbsds ]; + platforms = lib.platforms.linux; + changelog = "https://github.com/geteduroam/linux-app/releases/tag/${finalAttrs.version}"; + mainProgram = "geteduroam-gui"; + }; +}) From c64cc694e430e33c2d2f0e5b5743b372dbd5e6f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 23:07:46 +0000 Subject: [PATCH 168/272] libretro.vice-x128: 0-unstable-2025-05-08 -> 0-unstable-2025-05-16 --- pkgs/applications/emulators/libretro/cores/vice.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/vice.nix b/pkgs/applications/emulators/libretro/cores/vice.nix index 7a97782a9443..56567ff86376 100644 --- a/pkgs/applications/emulators/libretro/cores/vice.nix +++ b/pkgs/applications/emulators/libretro/cores/vice.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "vice-${type}"; - version = "0-unstable-2025-05-08"; + version = "0-unstable-2025-05-16"; src = fetchFromGitHub { owner = "libretro"; repo = "vice-libretro"; - rev = "5f094cfb57d1f656027a9d26bda681b6ecc46419"; - hash = "sha256-XqWAh3e2Q/i7c8nxqDP+sJHGdYWCyqdk2pwJ+JPsdVk="; + rev = "86bcfa8c4839236f70e31c656d220c074ff1dfb0"; + hash = "sha256-Dw+dY1IsR5cIzXa61bWO+2GhrYqgC2ASMjxQe2MVeco="; }; makefile = "Makefile"; From 6d85cc6c1cf22d7668c665b0cccb01fa4fff83c8 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 20 May 2025 01:12:38 +0200 Subject: [PATCH 169/272] ipmitool: fix IANA registry warnings --- pkgs/by-name/ip/ipmitool/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ip/ipmitool/package.nix b/pkgs/by-name/ip/ipmitool/package.nix index 9a4e2b2cb1ce..565b815874fa 100644 --- a/pkgs/by-name/ip/ipmitool/package.nix +++ b/pkgs/by-name/ip/ipmitool/package.nix @@ -37,12 +37,13 @@ stdenv.mkDerivation { readline ]; - postPatch = '' - cp ${iana-enterprise-numbers} enterprise-numbers - ''; - configureFlags = [ "--disable-registry-download" ]; + postInstall = '' + # Install to path reported in configure as "Set IANA PEN dictionary search path to ..." + install -Dm444 ${iana-enterprise-numbers} $out/share/misc/enterprise-numbers + ''; + meta = { description = "Command-line interface to IPMI-enabled devices"; mainProgram = "ipmitool"; From 73c76f9258fbbb064e5126885f6dbb23a33047d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 23:53:42 +0000 Subject: [PATCH 170/272] clickhouse-backup: 2.6.16 -> 2.6.18 --- pkgs/by-name/cl/clickhouse-backup/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clickhouse-backup/package.nix b/pkgs/by-name/cl/clickhouse-backup/package.nix index 929317b7a2e6..6e5010edffae 100644 --- a/pkgs/by-name/cl/clickhouse-backup/package.nix +++ b/pkgs/by-name/cl/clickhouse-backup/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.6.16"; + version = "2.6.18"; src = fetchFromGitHub { owner = "Altinity"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-3RckJDhMtmK/Yusad1McFee/ECYomAwxY+WlimkPPCs="; + hash = "sha256-NB3X/lwLsq6C+jZ7Tfq2HbMcqpNiD2bpoJcwXCKdsfw="; }; vendorHash = "sha256-tgDNKujpmDk6wcP9jEwfSbRWzJqiPs7aAWkkaD195Ss="; From 7bc30eadf3c42ef68a91927089f6e9abe3e0f802 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 00:13:28 +0000 Subject: [PATCH 171/272] swayimg: 3.9 -> 4.0 --- pkgs/by-name/sw/swayimg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix index 369c7897ef7c..0290529a4ead 100644 --- a/pkgs/by-name/sw/swayimg/package.nix +++ b/pkgs/by-name/sw/swayimg/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "swayimg"; - version = "3.9"; + version = "4.0"; src = fetchFromGitHub { owner = "artemsen"; repo = "swayimg"; tag = "v${finalAttrs.version}"; - hash = "sha256-QPTODuVVDQCP7Ix63F0J0tOzfg5Q9B4GXaxjuTerkI0="; + hash = "sha256-2UmaU60+5NNj2CVJt4oJXyBPjVeA0zBfEqZOOSI2vvk="; }; strictDeps = true; From ba675822e9cbf1766aba08c2a1d4fa311d14056b Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 20 May 2025 02:15:17 +0200 Subject: [PATCH 172/272] synapse-admin-etkecc: 0.10.4-etke40 -> 0.10.4-etke41 --- pkgs/by-name/sy/synapse-admin-etkecc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix index 7b0229ab3da6..b4356f22f81f 100644 --- a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix +++ b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix @@ -17,18 +17,18 @@ assert lib.asserts.assertMsg ( stdenv.mkDerivation (finalAttrs: { pname = "synapse-admin-etkecc"; - version = "0.10.4-etke40"; + version = "0.10.4-etke41"; src = fetchFromGitHub { owner = "etkecc"; repo = "synapse-admin"; tag = "v${finalAttrs.version}"; - hash = "sha256-QIOQ25K/QCpSAz3HMOADSIVb3iqfdNCNmWrn7xD0ytU="; + hash = "sha256-LHZtB6139sV2HdbIKCZruwH1G5+8iTfKXwjjo4gbNcI="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-YQZN9tj0zGnC4gmTvHM32mdaOw5RFuUL2ZKd9/8GNZA="; + hash = "sha256-wdnmsz41rIu8HvsoVHSW8PZLwtmwpz+YSeeDs1GT/vA="; }; nativeBuildInputs = [ From d368ad3a662f21289b43c8d31f62412f9a91b432 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 01:24:43 +0000 Subject: [PATCH 173/272] heliocron: 0.8.1 -> 1.0.0 --- pkgs/by-name/he/heliocron/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/he/heliocron/package.nix b/pkgs/by-name/he/heliocron/package.nix index f0bf7a9e693f..440261107482 100644 --- a/pkgs/by-name/he/heliocron/package.nix +++ b/pkgs/by-name/he/heliocron/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "heliocron"; - version = "0.8.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "mfreeborn"; repo = "heliocron"; rev = "v${version}"; - hash = "sha256-5rzFz29Bpy2GR6bEt2DdCq9RtpdcY3SK/KnZrBrHUvk="; + hash = "sha256-tqwVYIU8RXb1hiKnP7AlkxHsMhbAlwSmPGyFFMHIbAo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-as1rMyLqK0Z+UrO6B7Fzn2nNQM0xRrLoEPd2WlANxe8="; + cargoHash = "sha256-rQriNb/njEUBUmCUy5NKEfOYkOLy9i7ClU0vR72udOo="; meta = { description = "Execute tasks relative to sunset, sunrise and other solar events"; From f8163822d8ff93b0a961303713a6ae3d003bda48 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Tue, 20 May 2025 11:18:36 +0900 Subject: [PATCH 174/272] cryptpad: use full path for ln in wrapper script This allows running cryptpad even if coreutils is not in PATH Fixes: #408753 --- pkgs/by-name/cr/cryptpad/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/cr/cryptpad/package.nix b/pkgs/by-name/cr/cryptpad/package.nix index 94087f88b86b..59dc4bd28008 100644 --- a/pkgs/by-name/cr/cryptpad/package.nix +++ b/pkgs/by-name/cr/cryptpad/package.nix @@ -1,6 +1,7 @@ { bash, buildNpmPackage, + coreutils, fetchFromGitHub, fetchpatch, fetchurl, @@ -147,7 +148,7 @@ buildNpmPackage { # directory. makeWrapper "${lib.getExe nodejs}" "$out/bin/cryptpad" \ --add-flags "$out_cryptpad/server.js" \ - --run "for d in customize.dist lib www; do ln -sf \"$out_cryptpad/\$d\" .; done" \ + --run "for d in customize.dist lib www; do ${coreutils}/bin/ln -sf \"$out_cryptpad/\$d\" .; done" \ --run "if ! [ -d customize ]; then \"${lib.getExe nodejs}\" \"$out_cryptpad/scripts/build.js\"; fi" ''; From 25363b9ab177e219fb16e7a3545b120e6b66285c Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Tue, 20 May 2025 11:13:29 +0900 Subject: [PATCH 175/272] cryptpad: 2024.12.0 -> 2025.3.0 On update cryptpad tries to run a migration script from run dir as ./scripts... so add a link for scripts as well Fixes: #404114 --- pkgs/by-name/cr/cryptpad/package.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/cr/cryptpad/package.nix b/pkgs/by-name/cr/cryptpad/package.nix index 59dc4bd28008..804ff3c72a29 100644 --- a/pkgs/by-name/cr/cryptpad/package.nix +++ b/pkgs/by-name/cr/cryptpad/package.nix @@ -14,7 +14,7 @@ }: let - version = "2024.12.0"; + version = "2025.3.0"; # nix version of install-onlyoffice.sh # a later version could rebuild from sdkjs/web-apps as per # https://github.com/cryptpad/onlyoffice-builds/blob/main/build.sh @@ -84,10 +84,10 @@ buildNpmPackage { owner = "cryptpad"; repo = "cryptpad"; rev = version; - hash = "sha256-oSrDajaCEc7I2AsDzKoO34ffd4OeXDwFDGm45yQDSvE="; + hash = "sha256-NxkVMsfLzdzifdn+f0C6mBJGd1oLwcMTAIXv+gBG7rI="; }; - npmDepsHash = "sha256-1EwxAe+8FOrngZx5+FEeu9uHKWZNBpsECEGrsyiZ2GU="; + npmDepsHash = "sha256-GWkyRlizPSA72WwoY+mRLwaMeD/SXdo6oUVwsd2gp7c="; nativeBuildInputs = [ makeBinaryWrapper @@ -100,12 +100,6 @@ buildNpmPackage { # fix httpSafePort setting # https://github.com/cryptpad/cryptpad/pull/1571 ./0001-env.js-fix-httpSafePort-handling.patch - # https://github.com/cryptpad/cryptpad/pull/1740 - (fetchpatch { - name = "Add `--check`, `--rdfind`, `--no-rdfind` options to `install-onlyoffice.sh`"; - url = "https://github.com/cryptpad/cryptpad/commit/f38668735e777895db2eadd3413cff386fb12c0c.patch"; - hash = "sha256-J4AK1XIa3q+/lD74p2c9O7jt0VEtofTmfAaQNU71sp8="; - }) ]; # cryptpad build tries to write in cache dir @@ -148,7 +142,7 @@ buildNpmPackage { # directory. makeWrapper "${lib.getExe nodejs}" "$out/bin/cryptpad" \ --add-flags "$out_cryptpad/server.js" \ - --run "for d in customize.dist lib www; do ${coreutils}/bin/ln -sf \"$out_cryptpad/\$d\" .; done" \ + --run "for d in customize.dist lib www scripts; do ${coreutils}/bin/ln -sf \"$out_cryptpad/\$d\" .; done" \ --run "if ! [ -d customize ]; then \"${lib.getExe nodejs}\" \"$out_cryptpad/scripts/build.js\"; fi" ''; From b8a2f7fff97f0c6bd08fec90d28e4e6291c86e0f Mon Sep 17 00:00:00 2001 From: Rebecca Kelly Date: Mon, 19 May 2025 11:17:06 -0400 Subject: [PATCH 176/272] deliantra-server: remove I'm not really using or maintaining it anymore and it's getting increasingly bit-rotted. --- nixos/modules/module-list.nix | 1 - .../services/games/deliantra-server.nix | 182 ------------------ pkgs/games/deliantra/0001-abs.patch | 17 -- pkgs/games/deliantra/0002-datadir.patch | 11 -- pkgs/games/deliantra/0003-swap.patch | 14 -- pkgs/games/deliantra/arch.nix | 33 ---- pkgs/games/deliantra/data.nix | 30 --- pkgs/games/deliantra/maps.nix | 33 ---- pkgs/games/deliantra/server.nix | 93 --------- pkgs/top-level/all-packages.nix | 9 - 10 files changed, 423 deletions(-) delete mode 100644 nixos/modules/services/games/deliantra-server.nix delete mode 100644 pkgs/games/deliantra/0001-abs.patch delete mode 100644 pkgs/games/deliantra/0002-datadir.patch delete mode 100644 pkgs/games/deliantra/0003-swap.patch delete mode 100644 pkgs/games/deliantra/arch.nix delete mode 100644 pkgs/games/deliantra/data.nix delete mode 100644 pkgs/games/deliantra/maps.nix delete mode 100644 pkgs/games/deliantra/server.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 606eb5e7487f..5d5c097863fc 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -603,7 +603,6 @@ ./services/games/archisteamfarm.nix ./services/games/armagetronad.nix ./services/games/crossfire-server.nix - ./services/games/deliantra-server.nix ./services/games/factorio.nix ./services/games/freeciv.nix ./services/games/mchprs.nix diff --git a/nixos/modules/services/games/deliantra-server.nix b/nixos/modules/services/games/deliantra-server.nix deleted file mode 100644 index 4854731714f7..000000000000 --- a/nixos/modules/services/games/deliantra-server.nix +++ /dev/null @@ -1,182 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - cfg = config.services.deliantra-server; - serverPort = 13327; -in -{ - options.services.deliantra-server = { - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - If enabled, the Deliantra game server will be started at boot. - ''; - }; - - package = lib.mkPackageOption pkgs "deliantra-server" { - extraDescription = '' - ::: {.note} - This will also be used for map/arch data, if you don't change {option}`dataDir` - ::: - ''; - }; - - dataDir = lib.mkOption { - type = lib.types.str; - default = "${pkgs.deliantra-data}"; - defaultText = lib.literalExpression ''"''${pkgs.deliantra-data}"''; - description = '' - Where to store readonly data (maps, archetypes, sprites, etc). - Note that if you plan to use the live map editor (rather than editing - the maps offline and then nixos-rebuilding), THIS MUST BE WRITEABLE -- - copy the deliantra-data someplace writeable (say, - /var/lib/deliantra/data) and update this option accordingly. - ''; - }; - - stateDir = lib.mkOption { - type = lib.types.str; - default = "/var/lib/deliantra"; - description = '' - Where to store runtime data (save files, persistent items, etc). - - If left at the default, this will be automatically created on server - startup if it does not already exist. If changed, it is the admin's - responsibility to make sure that the directory exists and is writeable - by the `crossfire` user. - ''; - }; - - openFirewall = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to open ports in the firewall for the server. - ''; - }; - - configFiles = lib.mkOption { - type = lib.types.attrsOf lib.types.str; - description = '' - Contents of the server configuration files. These will be appended to - the example configurations the server comes with and overwrite any - default settings defined therein. - - The example here is not comprehensive. See the files in - /etc/deliantra-server after enabling this module for full documentation. - ''; - example = lib.literalExpression '' - { - dm_file = ''' - admin:secret_password:localhost - alice:xyzzy:* - '''; - motd = "Welcome to Deliantra!"; - settings = ''' - # Settings for game mechanics. - stat_loss_on_death true - armor_max_enchant 7 - '''; - config = ''' - # Settings for the server daemon. - hiscore_url https://deliantra.example.net/scores/ - max_map_reset 86400 - '''; - } - ''; - default = { - motd = ""; - }; - }; - }; - - config = lib.mkIf cfg.enable { - users.users.deliantra = { - description = "Deliantra server daemon user"; - home = cfg.stateDir; - createHome = false; - isSystemUser = true; - group = "deliantra"; - }; - users.groups.deliantra = { }; - - # Merge the cfg.configFiles setting with the default files shipped with - # Deliantra. - # For most files this consists of reading - # ${deliantra}/etc/deliantra-server/${name} and appending the user setting - # to it. - environment.etc = - lib.attrsets.mapAttrs' - ( - name: value: - lib.attrsets.nameValuePair "deliantra-server/${name}" { - mode = "0644"; - text = - # Deliantra doesn't come with a motd file, but respects it if present - # in /etc. - (lib.optionalString (name != "motd") ( - lib.fileContents "${cfg.package}/etc/deliantra-server/${name}" - )) - + "\n${value}"; - } - ) - ( - { - motd = ""; - settings = ""; - config = ""; - dm_file = ""; - } - // cfg.configFiles - ); - - systemd.services.deliantra-server = { - description = "Deliantra Server Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - environment = { - DELIANTRA_DATADIR = "${cfg.dataDir}"; - DELIANTRA_LOCALDIR = "${cfg.stateDir}"; - DELIANTRA_CONFDIR = "/etc/deliantra-server"; - }; - - serviceConfig = lib.mkMerge [ - { - ExecStart = "${cfg.package}/bin/deliantra-server"; - Restart = "always"; - User = "deliantra"; - Group = "deliantra"; - WorkingDirectory = cfg.stateDir; - } - (lib.mkIf (cfg.stateDir == "/var/lib/deliantra") { - StateDirectory = "deliantra"; - }) - ]; - - # The deliantra server needs access to a bunch of files at runtime that - # are not created automatically at server startup; they're meant to be - # installed in $PREFIX/var/deliantra-server by `make install`. And those - # files need to be writeable, so we can't just point at the ones in the - # nix store. Instead we take the approach of copying them out of the store - # on first run. If `bookarch` already exists, we assume the rest of the - # files do as well, and copy nothing -- otherwise we risk ovewriting - # server state information every time the server is upgraded. - preStart = '' - if [ ! -e "${cfg.stateDir}"/bookarch ]; then - ${pkgs.rsync}/bin/rsync -a --chmod=u=rwX,go=rX \ - "${cfg.package}/var/deliantra-server/" "${cfg.stateDir}/" - fi - ''; - }; - - networking.firewall = lib.mkIf cfg.openFirewall { - allowedTCPPorts = [ serverPort ]; - }; - }; -} diff --git a/pkgs/games/deliantra/0001-abs.patch b/pkgs/games/deliantra/0001-abs.patch deleted file mode 100644 index d116317e243a..000000000000 --- a/pkgs/games/deliantra/0001-abs.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/utils/cfhq2xa.C -+++ b/utils/cfhq2xa.C -@@ -182,10 +182,10 @@ static inline bool Diff (pixel w1, pixel w2) - pixel YUV1 = RGBAtoYUVA (w1); - pixel YUV2 = RGBAtoYUVA (w2); - -- return ((abs (((YUV1 >> Rshift) & Cmask) - ((YUV2 >> Rshift) & Cmask)) > trY) || -- (abs (((YUV1 >> Gshift) & Cmask) - ((YUV2 >> Gshift) & Cmask)) > trU) || -- (abs (((YUV1 >> Bshift) & Cmask) - ((YUV2 >> Bshift) & Cmask)) > trV) || -- (abs (((YUV1 >> Ashift) & Cmask) - ((YUV2 >> Ashift) & Cmask)) > trA) ); -+ return ((abs ((signed int)((YUV1 >> Rshift) & Cmask) - (signed int)((YUV2 >> Rshift) & Cmask)) > trY) || -+ (abs ((signed int)((YUV1 >> Gshift) & Cmask) - (signed int)((YUV2 >> Gshift) & Cmask)) > trU) || -+ (abs ((signed int)((YUV1 >> Bshift) & Cmask) - (signed int)((YUV2 >> Bshift) & Cmask)) > trV) || -+ (abs ((signed int)((YUV1 >> Ashift) & Cmask) - (signed int)((YUV2 >> Ashift) & Cmask)) > trA) ); - } - - static void diff --git a/pkgs/games/deliantra/0002-datadir.patch b/pkgs/games/deliantra/0002-datadir.patch deleted file mode 100644 index 1c8e847d88c6..000000000000 --- a/pkgs/games/deliantra/0002-datadir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/utils/cfutil.in -+++ b/utils/cfutil.in -@@ -27,7 +27,7 @@ use common::sense; - my $prefix = "@prefix@"; - my $exec_prefix = "@exec_prefix@"; - my $datarootdir = "@datarootdir@"; --my $DATADIR = "@datadir@/@PACKAGE@"; -+my $DATADIR = $ENV{'DELIANTRA_DATADIR'} || "@datadir@/@PACKAGE@"; - - my $CONVERT = "@CONVERT@"; - my $IDENTIFY = "@IDENTIFY@"; diff --git a/pkgs/games/deliantra/0003-swap.patch b/pkgs/games/deliantra/0003-swap.patch deleted file mode 100644 index fa4e2bdec425..000000000000 --- a/pkgs/games/deliantra/0003-swap.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/include/util.h -+++ b/include/util.h -@@ -449,6 +449,11 @@ struct slice_allocator - { - p->~Tp (); - } -+ -+ bool operator ==(const slice_allocator &) const -+ { -+ return true; -+ } - }; - - // basically a memory area, but refcounted diff --git a/pkgs/games/deliantra/arch.nix b/pkgs/games/deliantra/arch.nix deleted file mode 100644 index 24fdaa82df48..000000000000 --- a/pkgs/games/deliantra/arch.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - deliantra-server, -}: - -stdenv.mkDerivation rec { - pname = "deliantra-arch"; - version = "3.1"; - - src = fetchurl { - url = "http://dist.schmorp.de/deliantra/${pname}-${version}.tar.xz"; - sha256 = "1xzhv48g90hwkzgx9nfjm81ivg6hchkik9ldimi8ijb4j393kvsz"; - }; - - installPhase = '' - mkdir -p "$out" - export DELIANTRA_DATADIR="$out" - ${deliantra-server}/bin/cfutil --install-arch . - ''; - - meta = with lib; { - description = "Archetype data for the Deliantra free MMORPG"; - homepage = "http://www.deliantra.net/"; - license = with licenses; [ - gpl2Plus - agpl3Plus - ]; - platforms = platforms.linux; - maintainers = with maintainers; [ ToxicFrog ]; - }; -} diff --git a/pkgs/games/deliantra/data.nix b/pkgs/games/deliantra/data.nix deleted file mode 100644 index 7d16f4a3d915..000000000000 --- a/pkgs/games/deliantra/data.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - deliantra-maps, - deliantra-arch, - deliantra-server, - symlinkJoin, -}: - -symlinkJoin rec { - name = "deliantra-data-${version}"; - version = "M${deliantra-maps.version}+A${deliantra-arch.version}"; - - paths = [ - deliantra-maps - deliantra-arch - "${deliantra-server}/share/deliantra-server" - ]; - - meta = with lib; { - description = "Combined game data (maps + archetypes) for the Deliantra free MMORPG"; - homepage = "http://www.deliantra.net/"; - license = with licenses; [ - gpl2Plus - agpl3Plus - ]; - platforms = platforms.linux; - maintainers = with maintainers; [ ToxicFrog ]; - hydraPlatforms = [ ]; - }; -} diff --git a/pkgs/games/deliantra/maps.nix b/pkgs/games/deliantra/maps.nix deleted file mode 100644 index f630a1e50d3a..000000000000 --- a/pkgs/games/deliantra/maps.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - deliantra-server, -}: - -stdenv.mkDerivation rec { - pname = "deliantra-maps"; - version = "3.1"; - - src = fetchurl { - url = "http://dist.schmorp.de/deliantra/${pname}-${version}.tar.xz"; - sha256 = "0zbwzya28s1xpnbrmqkqvfrzns03zdjd8a9w9nk665aif6rw2zbz"; - }; - - installPhase = '' - mkdir -p "$out/maps" - export DELIANTRA_DATADIR="$out" - ${deliantra-server}/bin/cfutil --install-maps . - ''; - - meta = with lib; { - description = "Map data for the Deliantra free MMORPG"; - homepage = "http://www.deliantra.net/"; - license = with licenses; [ - gpl2Plus - agpl3Plus - ]; - platforms = platforms.linux; - maintainers = with maintainers; [ ToxicFrog ]; - }; -} diff --git a/pkgs/games/deliantra/server.nix b/pkgs/games/deliantra/server.nix deleted file mode 100644 index 9f92d99aad1b..000000000000 --- a/pkgs/games/deliantra/server.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - perlPackages, - autoconf, - perl, - gperf, - optipng, - pngnq, - rsync, - imagemagick, - blitz, - pkg-config, - glib, - boost, - makeWrapper, -}: - -let - perl-deps = with perlPackages; [ - AnyEvent - AnyEventAIO - AnyEventBDB - AnyEventIRC - CompressLZF - commonsense - Coro - CoroEV - Deliantra - DigestSHA1 - EV - PodPOM - SafeHole - URI - YAMLLibYAML - ]; -in -stdenv.mkDerivation rec { - pname = "deliantra-server"; - version = "3.1"; - - src = fetchurl { - url = "http://dist.schmorp.de/deliantra/${pname}-${version}.tar.xz"; - sha256 = "0v0m2m9fxq143aknh7jb3qj8bnpjrs3bpbbx07c18516y3izr71d"; - }; - - nativeBuildInputs = [ - autoconf - perl - gperf - optipng - pngnq - rsync - imagemagick - pkg-config - makeWrapper - ]; - - propagatedBuildInputs = perl-deps; - - buildInputs = [ - blitz - boost - glib - ]; - - hardeningDisable = [ "format" ]; - - patches = [ - ./0001-abs.patch - ./0002-datadir.patch - ./0003-swap.patch - ]; - - env.CXXFLAGS = "-std=c++11"; - - postFixup = '' - wrapProgram $out/bin/cfutil --prefix PERL5LIB : $PERL5LIB - wrapProgram $out/bin/deliantra-server --prefix PERL5LIB : $PERL5LIB - ''; - - meta = with lib; { - description = "Server for the Deliantra free MMORPG"; - homepage = "http://www.deliantra.net/"; - license = with licenses; [ - gpl2Plus - agpl3Plus - ]; - platforms = platforms.linux; - maintainers = with maintainers; [ ToxicFrog ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ba7ce5705b1..30167395c517 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14931,15 +14931,6 @@ with pkgs; cutemaze = qt6Packages.callPackage ../games/cutemaze { }; - deliantra-server = callPackage ../games/deliantra/server.nix { - # perl538 defines 'struct object' in sv.h. many conflicts result - perl = perl540; - perlPackages = perl540Packages; - }; - deliantra-arch = callPackage ../games/deliantra/arch.nix { }; - deliantra-maps = callPackage ../games/deliantra/maps.nix { }; - deliantra-data = callPackage ../games/deliantra/data.nix { }; - ddnet-server = ddnet.override { buildClient = false; }; duckmarines = callPackage ../games/duckmarines { love = love_0_10; }; From 55e671aa8885a603444bfb97dd6bd0c01353fb42 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Fri, 18 Apr 2025 18:45:24 -0700 Subject: [PATCH 177/272] share-preview: 0.5.0 -> 1.0.0 --- pkgs/by-name/sh/share-preview/package.nix | 12 +- .../sh/share-preview/wasm-bindgen.patch | 3423 ----------------- 2 files changed, 4 insertions(+), 3431 deletions(-) delete mode 100644 pkgs/by-name/sh/share-preview/wasm-bindgen.patch diff --git a/pkgs/by-name/sh/share-preview/package.nix b/pkgs/by-name/sh/share-preview/package.nix index 6ecd9e27d25b..29be893c1993 100644 --- a/pkgs/by-name/sh/share-preview/package.nix +++ b/pkgs/by-name/sh/share-preview/package.nix @@ -17,23 +17,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "share-preview"; - version = "0.5.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "rafaelmardojai"; repo = "share-preview"; rev = finalAttrs.version; - hash = "sha256-FqualaTkirB+gBcgkThQpSBHhM4iaXkiGujwBUnUX0E="; + hash = "sha256-6Pk+3o4ZWF5pDYAtcBgty4b7edzIZnIuJh0KW1VW33I="; }; - patches = [ - ./wasm-bindgen.patch - ]; - cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) src patches; + inherit (finalAttrs) src; name = "share-preview-${finalAttrs.version}"; - hash = "sha256-lDSRXe+AjJzWT0hda/aev6kNJAvHblGmmAYXdYhrnQs="; + hash = "sha256-MC5MsoFdeCvF9nIFoYCKoBBpgGysBH36OdmTqbIJt8s="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sh/share-preview/wasm-bindgen.patch b/pkgs/by-name/sh/share-preview/wasm-bindgen.patch deleted file mode 100644 index 1fbdac01b610..000000000000 --- a/pkgs/by-name/sh/share-preview/wasm-bindgen.patch +++ /dev/null @@ -1,3423 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 6bf4e0c..633a6e4 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1,12 +1,12 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. --version = 3 -+version = 4 - - [[package]] --name = "adler" --version = "1.0.2" -+name = "adler2" -+version = "2.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - - [[package]] - name = "aead" -@@ -64,104 +64,107 @@ dependencies = [ - - [[package]] - name = "aho-corasick" --version = "0.7.18" -+version = "1.1.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" - dependencies = [ - "memchr", - ] - - [[package]] - name = "anyhow" --version = "1.0.56" -+version = "1.0.98" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" -+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" - - [[package]] - name = "async-channel" --version = "1.6.1" -+version = "1.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -+dependencies = [ -+ "concurrent-queue", -+ "event-listener 2.5.3", -+ "futures-core", -+] -+ -+[[package]] -+name = "async-channel" -+version = "2.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" -+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" - dependencies = [ - "concurrent-queue", -- "event-listener", -+ "event-listener-strategy", - "futures-core", -+ "pin-project-lite", - ] - - [[package]] - name = "async-executor" --version = "1.4.1" -+version = "1.13.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" -+checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" - dependencies = [ - "async-task", - "concurrent-queue", -- "fastrand", -- "futures-lite", -- "once_cell", -+ "fastrand 2.3.0", -+ "futures-lite 2.6.0", - "slab", - ] - - [[package]] - name = "async-global-executor" --version = "2.0.3" -+version = "2.4.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c026b7e44f1316b567ee750fea85103f87fcb80792b860e979f221259796ca0a" -+checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" - dependencies = [ -- "async-channel", -+ "async-channel 2.3.1", - "async-executor", - "async-io", -- "async-mutex", -+ "async-lock", - "blocking", -- "futures-lite", -- "num_cpus", -+ "futures-lite 2.6.0", - "once_cell", - ] - - [[package]] - name = "async-io" --version = "1.6.0" -+version = "2.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" -+checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059" - dependencies = [ -+ "async-lock", -+ "cfg-if", - "concurrent-queue", -- "futures-lite", -- "libc", -- "log", -- "once_cell", -+ "futures-io", -+ "futures-lite 2.6.0", - "parking", - "polling", -+ "rustix", - "slab", -- "socket2", -- "waker-fn", -- "winapi", -+ "tracing", -+ "windows-sys 0.59.0", - ] - - [[package]] - name = "async-lock" --version = "2.5.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6" --dependencies = [ -- "event-listener", --] -- --[[package]] --name = "async-mutex" --version = "1.4.0" -+version = "3.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" -+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" - dependencies = [ -- "event-listener", -+ "event-listener 5.4.0", -+ "event-listener-strategy", -+ "pin-project-lite", - ] - - [[package]] - name = "async-std" --version = "1.12.0" -+version = "1.13.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" -+checksum = "730294c1c08c2e0f85759590518f6333f0d5a0a766a27d519c1b244c3dfd8a24" - dependencies = [ -- "async-channel", -+ "async-channel 1.9.0", - "async-global-executor", - "async-io", - "async-lock", -@@ -169,7 +172,7 @@ dependencies = [ - "futures-channel", - "futures-core", - "futures-io", -- "futures-lite", -+ "futures-lite 2.6.0", - "gloo-timers", - "kv-log-macro", - "log", -@@ -183,26 +186,26 @@ dependencies = [ - - [[package]] - name = "async-task" --version = "4.2.0" -+version = "4.7.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9" -+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" - - [[package]] - name = "async-trait" --version = "0.1.53" -+version = "0.1.88" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" -+checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" - dependencies = [ - "proc-macro2", - "quote", -- "syn 1.0.89", -+ "syn 2.0.100", - ] - - [[package]] - name = "atomic-waker" --version = "1.0.0" -+version = "1.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" -+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - - [[package]] - name = "atty" -@@ -210,34 +213,34 @@ version = "0.2.14" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" - dependencies = [ -- "hermit-abi", -+ "hermit-abi 0.1.19", - "libc", - "winapi", - ] - - [[package]] - name = "autocfg" --version = "1.1.0" -+version = "1.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" - - [[package]] - name = "base-x" --version = "0.2.8" -+version = "0.2.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" -+checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - - [[package]] - name = "base64" --version = "0.13.0" -+version = "0.13.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" -+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - - [[package]] - name = "bit_field" --version = "0.10.1" -+version = "0.10.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" -+checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" - - [[package]] - name = "bitflags" -@@ -247,9 +250,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - - [[package]] - name = "bitflags" --version = "2.4.0" -+version = "2.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" -+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" - - [[package]] - name = "bitmaps" -@@ -277,35 +280,34 @@ dependencies = [ - - [[package]] - name = "blocking" --version = "1.2.0" -+version = "1.6.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" -+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" - dependencies = [ -- "async-channel", -+ "async-channel 2.3.1", - "async-task", -- "atomic-waker", -- "fastrand", -- "futures-lite", -- "once_cell", -+ "futures-io", -+ "futures-lite 2.6.0", -+ "piper", - ] - - [[package]] - name = "bumpalo" --version = "3.9.1" -+version = "3.17.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" -+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" - - [[package]] - name = "bytemuck" --version = "1.8.0" -+version = "1.22.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0e851ca7c24871e7336801608a4797d7376545b6928a10d32d75685687141ead" -+checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540" - - [[package]] - name = "byteorder" --version = "1.4.3" -+version = "1.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" -+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - - [[package]] - name = "bytes" -@@ -315,23 +317,17 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - - [[package]] - name = "bytes" --version = "1.1.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" -- --[[package]] --name = "cache-padded" --version = "1.2.0" -+version = "1.10.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" -+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" - - [[package]] - name = "cairo-rs" --version = "0.19.2" -+version = "0.19.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c" -+checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" - dependencies = [ -- "bitflags 2.4.0", -+ "bitflags 2.9.0", - "cairo-sys-rs", - "glib", - "libc", -@@ -351,17 +347,21 @@ dependencies = [ - - [[package]] - name = "cc" --version = "1.0.73" -+version = "1.2.20" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" -+checksum = "04da6a0d40b948dfc4fa8f5bbf402b0fc1a64a28dbf7d12ffd683550f2c1b63a" -+dependencies = [ -+ "shlex", -+] - - [[package]] - name = "cfg-expr" --version = "0.10.2" -+version = "0.15.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5e068cb2806bbc15b439846dc16c5f89f8599f2c3e4d73d4449d38f9b2f0b6c5" -+checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" - dependencies = [ - "smallvec", -+ "target-lexicon", - ] - - [[package]] -@@ -387,18 +387,18 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - - [[package]] - name = "concurrent-queue" --version = "1.2.2" -+version = "2.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" -+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" - dependencies = [ -- "cache-padded", -+ "crossbeam-utils", - ] - - [[package]] - name = "const_fn" --version = "0.4.9" -+version = "0.4.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" -+checksum = "2f8a2ca5ac02d09563609681103aada9e1777d54fc57a5acd7a41404f9c93b6e" - - [[package]] - name = "convert_case" -@@ -425,9 +425,9 @@ dependencies = [ - - [[package]] - name = "cpufeatures" --version = "0.2.2" -+version = "0.2.17" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" -+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" - dependencies = [ - "libc", - ] -@@ -440,63 +440,43 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" - - [[package]] - name = "crc32fast" --version = "1.3.2" -+version = "1.4.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" - dependencies = [ - "cfg-if", - ] - --[[package]] --name = "crossbeam-channel" --version = "0.5.4" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" --dependencies = [ -- "cfg-if", -- "crossbeam-utils", --] -- - [[package]] - name = "crossbeam-deque" --version = "0.8.1" -+version = "0.8.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" -+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" - dependencies = [ -- "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", - ] - - [[package]] - name = "crossbeam-epoch" --version = "0.9.8" -+version = "0.9.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" -+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" - dependencies = [ -- "autocfg", -- "cfg-if", - "crossbeam-utils", -- "lazy_static", -- "memoffset", -- "scopeguard", - ] - - [[package]] - name = "crossbeam-utils" --version = "0.8.8" -+version = "0.8.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" --dependencies = [ -- "cfg-if", -- "lazy_static", --] -+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" - - [[package]] - name = "crunchy" --version = "0.2.2" -+version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" -+checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" - - [[package]] - name = "crypto-mac" -@@ -522,27 +502,17 @@ dependencies = [ - "proc-macro2", - "quote", - "smallvec", -- "syn 1.0.89", -+ "syn 1.0.109", - ] - - [[package]] - name = "cssparser-macros" --version = "0.6.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" --dependencies = [ -- "quote", -- "syn 1.0.89", --] -- --[[package]] --name = "ctor" --version = "0.1.22" -+version = "0.6.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" -+checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" - dependencies = [ - "quote", -- "syn 1.0.89", -+ "syn 2.0.100", - ] - - [[package]] -@@ -556,9 +526,9 @@ dependencies = [ - - [[package]] - name = "curl" --version = "0.4.43" -+version = "0.4.47" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "37d855aeef205b43f65a5001e0997d81f8efca7badad4fad7d897aa7f0d0651f" -+checksum = "d9fb4d13a1be2b58f14d60adba57c9834b78c62fd86c3e76a148f732686e9265" - dependencies = [ - "curl-sys", - "libc", -@@ -566,14 +536,14 @@ dependencies = [ - "openssl-sys", - "schannel", - "socket2", -- "winapi", -+ "windows-sys 0.52.0", - ] - - [[package]] - name = "curl-sys" --version = "0.4.53+curl-7.82.0" -+version = "0.4.80+curl-8.12.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8092905a5a9502c312f223b2775f57ec5c5b715f9a15ee9d2a8591d1364a0352" -+checksum = "55f7df2eac63200c3ab25bde3b2268ef2ee56af3d238e76d61f01c3c49bff734" - dependencies = [ - "cc", - "libc", -@@ -582,17 +552,7 @@ dependencies = [ - "openssl-sys", - "pkg-config", - "vcpkg", -- "winapi", --] -- --[[package]] --name = "dashmap" --version = "4.0.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" --dependencies = [ -- "cfg-if", -- "num_cpus", -+ "windows-sys 0.52.0", - ] - - [[package]] -@@ -603,15 +563,15 @@ checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" - - [[package]] - name = "derive_more" --version = "0.99.17" -+version = "0.99.20" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -+checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f" - dependencies = [ - "convert_case", - "proc-macro2", - "quote", -- "rustc_version 0.4.0", -- "syn 1.0.89", -+ "rustc_version 0.4.1", -+ "syn 2.0.100", - ] - - [[package]] -@@ -629,38 +589,49 @@ version = "1.0.4" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - -+[[package]] -+name = "displaydoc" -+version = "0.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn 2.0.100", -+] -+ - [[package]] - name = "dtoa" --version = "0.4.8" -+version = "1.0.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" -+checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04" - - [[package]] - name = "dtoa-short" --version = "0.3.3" -+version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6" -+checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" - dependencies = [ - "dtoa", - ] - - [[package]] - name = "ego-tree" --version = "0.6.2" -+version = "0.6.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3a68a4904193147e0a8dec3314640e6db742afd5f6e634f428a6af230d9b3591" -+checksum = "12a0bb14ac04a9fcf170d0bbbef949b44cc492f4452bd20c095636956f653642" - - [[package]] - name = "either" --version = "1.6.1" -+version = "1.15.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" -+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" - - [[package]] - name = "encoding_rs" --version = "0.8.30" -+version = "0.8.35" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" -+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" - dependencies = [ - "cfg-if", - ] -@@ -680,56 +651,101 @@ dependencies = [ - - [[package]] - name = "equivalent" --version = "1.0.1" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" -+ -+[[package]] -+name = "errno" -+version = "0.3.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" -+dependencies = [ -+ "libc", -+ "windows-sys 0.59.0", -+] -+ -+[[package]] -+name = "event-listener" -+version = "2.5.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - - [[package]] - name = "event-listener" --version = "2.5.2" -+version = "5.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" -+checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" -+dependencies = [ -+ "concurrent-queue", -+ "parking", -+ "pin-project-lite", -+] -+ -+[[package]] -+name = "event-listener-strategy" -+version = "0.5.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" -+dependencies = [ -+ "event-listener 5.4.0", -+ "pin-project-lite", -+] - - [[package]] - name = "exr" --version = "1.5.3" -+version = "1.73.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e8af5ef47e2ed89d23d0ecbc1b681b30390069de70260937877514377fc24feb" -+checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0" - dependencies = [ - "bit_field", -- "flume 0.10.14", - "half", - "lebe", - "miniz_oxide", -+ "rayon-core", - "smallvec", -- "threadpool", - "zune-inflate", - ] - - [[package]] - name = "fastrand" --version = "1.7.0" -+version = "1.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" -+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" - dependencies = [ - "instant", - ] - -+[[package]] -+name = "fastrand" -+version = "2.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" -+ -+[[package]] -+name = "fdeflate" -+version = "0.3.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c" -+dependencies = [ -+ "simd-adler32", -+] -+ - [[package]] - name = "field-offset" --version = "0.3.4" -+version = "0.3.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" -+checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" - dependencies = [ - "memoffset", -- "rustc_version 0.3.3", -+ "rustc_version 0.4.1", - ] - - [[package]] - name = "flate2" --version = "1.0.25" -+version = "1.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" -+checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece" - dependencies = [ - "crc32fast", - "miniz_oxide", -@@ -746,19 +762,6 @@ dependencies = [ - "spinning_top", - ] - --[[package]] --name = "flume" --version = "0.10.14" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" --dependencies = [ -- "futures-core", -- "futures-sink", -- "nanorand", -- "pin-project", -- "spin", --] -- - [[package]] - name = "fnv" - version = "1.0.7" -@@ -767,11 +770,10 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - - [[package]] - name = "form_urlencoded" --version = "1.0.1" -+version = "1.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" - dependencies = [ -- "matches", - "percent-encoding", - ] - -@@ -787,24 +789,24 @@ dependencies = [ - - [[package]] - name = "futures-channel" --version = "0.3.21" -+version = "0.3.31" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" -+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" - dependencies = [ - "futures-core", - ] - - [[package]] - name = "futures-core" --version = "0.3.21" -+version = "0.3.31" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" -+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" - - [[package]] - name = "futures-executor" --version = "0.3.21" -+version = "0.3.31" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" -+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" - dependencies = [ - "futures-core", - "futures-task", -@@ -813,17 +815,17 @@ dependencies = [ - - [[package]] - name = "futures-io" --version = "0.3.21" -+version = "0.3.31" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" -+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" - - [[package]] - name = "futures-lite" --version = "1.12.0" -+version = "1.13.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" -+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" - dependencies = [ -- "fastrand", -+ "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", -@@ -832,34 +834,47 @@ dependencies = [ - "waker-fn", - ] - -+[[package]] -+name = "futures-lite" -+version = "2.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532" -+dependencies = [ -+ "fastrand 2.3.0", -+ "futures-core", -+ "futures-io", -+ "parking", -+ "pin-project-lite", -+] -+ - [[package]] - name = "futures-macro" --version = "0.3.21" -+version = "0.3.31" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" -+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" - dependencies = [ - "proc-macro2", - "quote", -- "syn 1.0.89", -+ "syn 2.0.100", - ] - - [[package]] - name = "futures-sink" --version = "0.3.21" -+version = "0.3.31" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" -+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" - - [[package]] - name = "futures-task" --version = "0.3.21" -+version = "0.3.31" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" -+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" - - [[package]] - name = "futures-util" --version = "0.3.21" -+version = "0.3.31" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" -+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" - dependencies = [ - "futures-core", - "futures-io", -@@ -882,9 +897,9 @@ dependencies = [ - - [[package]] - name = "gdk-pixbuf" --version = "0.19.2" -+version = "0.19.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" -+checksum = "624eaba126021103c7339b2e179ae4ee8cdab842daab419040710f38ed9f8699" - dependencies = [ - "gdk-pixbuf-sys", - "gio", -@@ -894,9 +909,9 @@ dependencies = [ - - [[package]] - name = "gdk-pixbuf-sys" --version = "0.19.0" -+version = "0.19.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" -+checksum = "4efa05a4f83c8cc50eb4d883787b919b85e5f1d8dd10b5a1df53bf5689782379" - dependencies = [ - "gio-sys", - "glib-sys", -@@ -907,9 +922,9 @@ dependencies = [ - - [[package]] - name = "gdk4" --version = "0.8.1" -+version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b" -+checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07" - dependencies = [ - "cairo-rs", - "gdk-pixbuf", -@@ -922,9 +937,9 @@ dependencies = [ - - [[package]] - name = "gdk4-sys" --version = "0.8.1" -+version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626" -+checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd" - dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", -@@ -939,9 +954,9 @@ dependencies = [ - - [[package]] - name = "generic-array" --version = "0.14.5" -+version = "0.14.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" -+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" - dependencies = [ - "typenum", - "version_check", -@@ -969,15 +984,13 @@ dependencies = [ - - [[package]] - name = "getrandom" --version = "0.2.6" -+version = "0.2.16" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" -+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" - dependencies = [ - "cfg-if", -- "js-sys", - "libc", -- "wasi 0.10.2+wasi-snapshot-preview1", -- "wasm-bindgen", -+ "wasi 0.11.0+wasi-snapshot-preview1", - ] - - [[package]] -@@ -992,9 +1005,9 @@ dependencies = [ - - [[package]] - name = "gettext-sys" --version = "0.21.3" -+version = "0.21.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" -+checksum = "f7b8797f28f2dabfbe2caadb6db4f7fd739e251b5ede0a2ba49e506071edcf67" - dependencies = [ - "cc", - "temp-dir", -@@ -1012,9 +1025,9 @@ dependencies = [ - - [[package]] - name = "gif" --version = "0.11.3" -+version = "0.13.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c3a7187e78088aead22ceedeee99779455b23fc231fe13ec443f99bb71694e5b" -+checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" - dependencies = [ - "color_quant", - "weezl", -@@ -1022,9 +1035,9 @@ dependencies = [ - - [[package]] - name = "gio" --version = "0.19.3" -+version = "0.19.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c64947d08d7fbb03bf8ad1f25a8ac6cf4329bc772c9b7e5abe7bf9493c81194f" -+checksum = "4c49f117d373ffcc98a35d114db5478bc223341cff53e39a5d6feced9e2ddffe" - dependencies = [ - "futures-channel", - "futures-core", -@@ -1040,9 +1053,9 @@ dependencies = [ - - [[package]] - name = "gio-sys" --version = "0.19.0" -+version = "0.19.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" -+checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef" - dependencies = [ - "glib-sys", - "gobject-sys", -@@ -1053,11 +1066,11 @@ dependencies = [ - - [[package]] - name = "glib" --version = "0.19.3" -+version = "0.19.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "01e191cc1af1f35b9699213107068cd3fe05d9816275ac118dc785a0dd8faebf" -+checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44" - dependencies = [ -- "bitflags 2.4.0", -+ "bitflags 2.9.0", - "futures-channel", - "futures-core", - "futures-executor", -@@ -1075,22 +1088,22 @@ dependencies = [ - - [[package]] - name = "glib-macros" --version = "0.19.3" -+version = "0.19.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9972bb91643d589c889654693a4f1d07697fdcb5d104b5c44fb68649ba1bf68d" -+checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7" - dependencies = [ -- "heck 0.5.0", -+ "heck", - "proc-macro-crate", - "proc-macro2", - "quote", -- "syn 2.0.53", -+ "syn 2.0.100", - ] - - [[package]] - name = "glib-sys" --version = "0.19.0" -+version = "0.19.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" -+checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5" - dependencies = [ - "libc", - "system-deps", -@@ -1098,9 +1111,9 @@ dependencies = [ - - [[package]] - name = "gloo-timers" --version = "0.2.3" -+version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4d12a7f4e95cfe710f1d624fb1210b7d961a5fb05c4fd942f4feab06e61f590e" -+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" - dependencies = [ - "futures-channel", - "futures-core", -@@ -1110,9 +1123,9 @@ dependencies = [ - - [[package]] - name = "gobject-sys" --version = "0.19.0" -+version = "0.19.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" -+checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e" - dependencies = [ - "glib-sys", - "libc", -@@ -1121,9 +1134,9 @@ dependencies = [ - - [[package]] - name = "graphene-rs" --version = "0.19.2" -+version = "0.19.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" -+checksum = "f5fb86031d24d9ec0a2a15978fc7a65d545a2549642cf1eb7c3dda358da42bcf" - dependencies = [ - "glib", - "graphene-sys", -@@ -1132,9 +1145,9 @@ dependencies = [ - - [[package]] - name = "graphene-sys" --version = "0.19.0" -+version = "0.19.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" -+checksum = "2f530e0944bccba4b55065e9c69f4975ad691609191ebac16e13ab8e1f27af05" - dependencies = [ - "glib-sys", - "libc", -@@ -1144,9 +1157,9 @@ dependencies = [ - - [[package]] - name = "gsk4" --version = "0.8.1" -+version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e" -+checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be" - dependencies = [ - "cairo-rs", - "gdk4", -@@ -1159,9 +1172,9 @@ dependencies = [ - - [[package]] - name = "gsk4-sys" --version = "0.8.1" -+version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738" -+checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc" - dependencies = [ - "cairo-sys-rs", - "gdk4-sys", -@@ -1181,9 +1194,9 @@ checksum = "da5bf7748fd4cd0b2490df8debcc911809dbcbee4ece9531b96c29a9c729de5a" - - [[package]] - name = "gtk4" --version = "0.8.1" -+version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83" -+checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab" - dependencies = [ - "cairo-rs", - "field-offset", -@@ -1202,23 +1215,21 @@ dependencies = [ - - [[package]] - name = "gtk4-macros" --version = "0.8.1" -+version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567" -+checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408" - dependencies = [ -- "anyhow", - "proc-macro-crate", -- "proc-macro-error", - "proc-macro2", - "quote", -- "syn 1.0.89", -+ "syn 2.0.100", - ] - - [[package]] - name = "gtk4-sys" --version = "0.8.1" -+version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18" -+checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5" - dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", -@@ -1235,24 +1246,19 @@ dependencies = [ - - [[package]] - name = "half" --version = "2.2.1" -+version = "2.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" -+checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" - dependencies = [ -+ "cfg-if", - "crunchy", - ] - - [[package]] - name = "hashbrown" --version = "0.14.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -- --[[package]] --name = "heck" --version = "0.4.0" -+version = "0.15.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" -+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" - - [[package]] - name = "heck" -@@ -1269,6 +1275,12 @@ dependencies = [ - "libc", - ] - -+[[package]] -+name = "hermit-abi" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" -+ - [[package]] - name = "hkdf" - version = "0.10.0" -@@ -1300,30 +1312,29 @@ dependencies = [ - "markup5ever", - "proc-macro2", - "quote", -- "syn 1.0.89", -+ "syn 1.0.109", - ] - - [[package]] - name = "http" --version = "0.2.6" -+version = "0.2.12" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" -+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" - dependencies = [ -- "bytes 1.1.0", -+ "bytes 1.10.1", - "fnv", -- "itoa 1.0.1", -+ "itoa 1.0.15", - ] - - [[package]] - name = "http-client" --version = "6.5.1" -+version = "6.5.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ea880b03c18a7e981d7fb3608b8904a98425d53c440758fcebf7d934aa56547c" -+checksum = "1947510dc91e2bf586ea5ffb412caad7673264e14bb39fb9078da114a94ce1a5" - dependencies = [ - "async-std", - "async-trait", - "cfg-if", -- "dashmap", - "http-types", - "isahc", - "log", -@@ -1336,11 +1347,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" - dependencies = [ - "anyhow", -- "async-channel", -+ "async-channel 1.9.0", - "async-std", - "base64", - "cookie", -- "futures-lite", -+ "futures-lite 1.13.0", - "infer", - "pin-project-lite", - "rand 0.7.3", -@@ -1353,9 +1364,9 @@ dependencies = [ - - [[package]] - name = "human_bytes" --version = "0.4.1" -+version = "0.4.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "39b528196c838e8b3da8b665e08c30958a6f2ede91d79f2ffcd0d4664b9c64eb" -+checksum = "91f255a4535024abf7640cb288260811fc14794f62b063652ed349f9a6c2348e" - - [[package]] - name = "humantime" -@@ -1367,95 +1378,222 @@ dependencies = [ - ] - - [[package]] --name = "idna" --version = "0.2.3" -+name = "icu_collections" -+version = "1.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" - dependencies = [ -- "matches", -- "unicode-bidi", -- "unicode-normalization", -+ "displaydoc", -+ "yoke", -+ "zerofrom", -+ "zerovec", - ] - - [[package]] --name = "im-rc" --version = "15.1.0" -+name = "icu_locid" -+version = "1.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "af1955a75fa080c677d3972822ec4bad316169ab1cfc6c257a942c2265dbe5fe" -+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" - dependencies = [ -- "bitmaps", -- "rand_core 0.6.3", -- "rand_xoshiro", -- "sized-chunks", -- "typenum", -- "version_check", -+ "displaydoc", -+ "litemap", -+ "tinystr", -+ "writeable", -+ "zerovec", - ] - - [[package]] --name = "image" --version = "0.24.5" -+name = "icu_locid_transform" -+version = "1.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945" -+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" - dependencies = [ -- "bytemuck", -- "byteorder", -- "color_quant", -- "exr", -- "gif", -- "jpeg-decoder", -- "num-rational", -- "num-traits", -- "png", -- "scoped_threadpool", -- "tiff", -+ "displaydoc", -+ "icu_locid", -+ "icu_locid_transform_data", -+ "icu_provider", -+ "tinystr", -+ "zerovec", - ] - - [[package]] --name = "indexmap" --version = "2.2.5" -+name = "icu_locid_transform_data" -+version = "1.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d" -+ -+[[package]] -+name = "icu_normalizer" -+version = "1.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" -+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" - dependencies = [ -- "equivalent", -- "hashbrown", -+ "displaydoc", -+ "icu_collections", -+ "icu_normalizer_data", -+ "icu_properties", -+ "icu_provider", -+ "smallvec", -+ "utf16_iter", -+ "utf8_iter", -+ "write16", -+ "zerovec", - ] - - [[package]] --name = "infer" --version = "0.2.3" -+name = "icu_normalizer_data" -+version = "1.5.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" -+checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7" - - [[package]] --name = "instant" --version = "0.1.12" -+name = "icu_properties" -+version = "1.5.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" - dependencies = [ -- "cfg-if", -+ "displaydoc", -+ "icu_collections", -+ "icu_locid_transform", -+ "icu_properties_data", -+ "icu_provider", -+ "tinystr", -+ "zerovec", - ] - - [[package]] --name = "isahc" --version = "0.9.14" -+name = "icu_properties_data" -+version = "1.5.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e2948a0ce43e2c2ef11d7edf6816508998d99e13badd1150be0914205df9388a" -+checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2" -+ -+[[package]] -+name = "icu_provider" -+version = "1.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" - dependencies = [ -- "bytes 0.5.6", -- "crossbeam-utils", -- "curl", -- "curl-sys", -- "flume 0.9.2", -- "futures-lite", -- "http", -- "log", -- "once_cell", -- "slab", -- "sluice", -- "tracing", -- "tracing-futures", -- "url", -- "waker-fn", -+ "displaydoc", -+ "icu_locid", -+ "icu_provider_macros", -+ "stable_deref_trait", -+ "tinystr", -+ "writeable", -+ "yoke", -+ "zerofrom", -+ "zerovec", -+] -+ -+[[package]] -+name = "icu_provider_macros" -+version = "1.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn 2.0.100", -+] -+ -+[[package]] -+name = "idna" -+version = "1.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" -+dependencies = [ -+ "idna_adapter", -+ "smallvec", -+ "utf8_iter", -+] -+ -+[[package]] -+name = "idna_adapter" -+version = "1.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" -+dependencies = [ -+ "icu_normalizer", -+ "icu_properties", -+] -+ -+[[package]] -+name = "im-rc" -+version = "15.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "af1955a75fa080c677d3972822ec4bad316169ab1cfc6c257a942c2265dbe5fe" -+dependencies = [ -+ "bitmaps", -+ "rand_core 0.6.4", -+ "rand_xoshiro", -+ "sized-chunks", -+ "typenum", -+ "version_check", -+] -+ -+[[package]] -+name = "image" -+version = "0.24.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" -+dependencies = [ -+ "bytemuck", -+ "byteorder", -+ "color_quant", -+ "exr", -+ "gif", -+ "jpeg-decoder", -+ "num-traits", -+ "png", -+ "qoi", -+ "tiff", -+] -+ -+[[package]] -+name = "indexmap" -+version = "2.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" -+dependencies = [ -+ "equivalent", -+ "hashbrown", -+] -+ -+[[package]] -+name = "infer" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" -+ -+[[package]] -+name = "instant" -+version = "0.1.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "isahc" -+version = "0.9.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2948a0ce43e2c2ef11d7edf6816508998d99e13badd1150be0914205df9388a" -+dependencies = [ -+ "bytes 0.5.6", -+ "crossbeam-utils", -+ "curl", -+ "curl-sys", -+ "flume", -+ "futures-lite 1.13.0", -+ "http", -+ "log", -+ "once_cell", -+ "slab", -+ "sluice", -+ "tracing", -+ "tracing-futures", -+ "url", -+ "waker-fn", - ] - - [[package]] -@@ -1466,25 +1604,26 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - - [[package]] - name = "itoa" --version = "1.0.1" -+version = "1.0.15" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" -+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" - - [[package]] - name = "jpeg-decoder" --version = "0.3.0" -+version = "0.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" -+checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" - dependencies = [ - "rayon", - ] - - [[package]] - name = "js-sys" --version = "0.3.56" -+version = "0.3.77" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" -+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" - dependencies = [ -+ "once_cell", - "wasm-bindgen", - ] - -@@ -1499,9 +1638,9 @@ dependencies = [ - - [[package]] - name = "lazy_static" --version = "1.4.0" -+version = "1.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - - [[package]] - name = "lebe" -@@ -1543,15 +1682,15 @@ dependencies = [ - - [[package]] - name = "libc" --version = "0.2.121" -+version = "0.2.172" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" -+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" - - [[package]] - name = "libnghttp2-sys" --version = "0.1.7+1.45.0" -+version = "0.1.11+1.64.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" -+checksum = "1b6c24e48a7167cffa7119da39d577fa482e66c688a4aac016bee862e1a713c4" - dependencies = [ - "cc", - "libc", -@@ -1559,9 +1698,9 @@ dependencies = [ - - [[package]] - name = "libz-sys" --version = "1.1.5" -+version = "1.1.22" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6f35facd4a5673cb5a48822be2be1d4236c1c99cb4113cab7061ac720d5bf859" -+checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d" - dependencies = [ - "cc", - "libc", -@@ -1569,6 +1708,18 @@ dependencies = [ - "vcpkg", - ] - -+[[package]] -+name = "linux-raw-sys" -+version = "0.4.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" -+ -+[[package]] -+name = "litemap" -+version = "0.7.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856" -+ - [[package]] - name = "locale_config" - version = "0.3.0" -@@ -1584,20 +1735,20 @@ dependencies = [ - - [[package]] - name = "lock_api" --version = "0.4.6" -+version = "0.4.12" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" -+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" - dependencies = [ -+ "autocfg", - "scopeguard", - ] - - [[package]] - name = "log" --version = "0.4.16" -+version = "0.4.27" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" -+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" - dependencies = [ -- "cfg-if", - "value-bag", - ] - -@@ -1632,36 +1783,36 @@ dependencies = [ - - [[package]] - name = "matches" --version = "0.1.9" -+version = "0.1.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" -+checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - - [[package]] - name = "memchr" --version = "2.7.1" -+version = "2.7.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" -+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - - [[package]] - name = "memoffset" --version = "0.6.5" -+version = "0.9.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" - dependencies = [ - "autocfg", - ] - - [[package]] - name = "mime" --version = "0.3.16" -+version = "0.3.17" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" -+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - - [[package]] - name = "mime_guess" --version = "2.0.4" -+version = "2.0.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" - dependencies = [ - "mime", - "unicase", -@@ -1669,27 +1820,19 @@ dependencies = [ - - [[package]] - name = "miniz_oxide" --version = "0.6.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" --dependencies = [ -- "adler", --] -- --[[package]] --name = "nanorand" --version = "0.7.0" -+version = "0.8.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -+checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" - dependencies = [ -- "getrandom 0.2.6", -+ "adler2", -+ "simd-adler32", - ] - - [[package]] - name = "new_debug_unreachable" --version = "1.0.4" -+version = "1.0.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" -+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - - [[package]] - name = "nodrop" -@@ -1697,46 +1840,15 @@ version = "0.1.14" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - --[[package]] --name = "num-integer" --version = "0.1.44" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" --dependencies = [ -- "autocfg", -- "num-traits", --] -- --[[package]] --name = "num-rational" --version = "0.4.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" --dependencies = [ -- "autocfg", -- "num-integer", -- "num-traits", --] -- - [[package]] - name = "num-traits" --version = "0.2.14" -+version = "0.2.19" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" - dependencies = [ - "autocfg", - ] - --[[package]] --name = "num_cpus" --version = "1.13.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" --dependencies = [ -- "hermit-abi", -- "libc", --] -- - [[package]] - name = "objc" - version = "0.2.7" -@@ -1768,29 +1880,28 @@ dependencies = [ - - [[package]] - name = "once_cell" --version = "1.10.0" -+version = "1.21.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" -+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" - - [[package]] - name = "opaque-debug" --version = "0.3.0" -+version = "0.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" - - [[package]] - name = "openssl-probe" --version = "0.1.5" -+version = "0.1.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" - - [[package]] - name = "openssl-sys" --version = "0.9.72" -+version = "0.9.107" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" -+checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07" - dependencies = [ -- "autocfg", - "cc", - "libc", - "pkg-config", -@@ -1799,9 +1910,9 @@ dependencies = [ - - [[package]] - name = "pango" --version = "0.19.3" -+version = "0.19.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1" -+checksum = "3f0d328648058085cfd6897c9ae4272884098a926f3a833cd50c8c73e6eccecd" - dependencies = [ - "gio", - "glib", -@@ -1811,9 +1922,9 @@ dependencies = [ - - [[package]] - name = "pango-sys" --version = "0.19.0" -+version = "0.19.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" -+checksum = "ff03da4fa086c0b244d4a4587d3e20622a3ecdb21daea9edf66597224c634ba0" - dependencies = [ - "glib-sys", - "gobject-sys", -@@ -1823,15 +1934,15 @@ dependencies = [ - - [[package]] - name = "parking" --version = "2.0.0" -+version = "2.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" -+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" - - [[package]] - name = "parking_lot" --version = "0.12.0" -+version = "0.12.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" -+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" - dependencies = [ - "lock_api", - "parking_lot_core", -@@ -1839,31 +1950,22 @@ dependencies = [ - - [[package]] - name = "parking_lot_core" --version = "0.9.1" -+version = "0.9.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" -+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" - dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", -- "windows-sys 0.32.0", -+ "windows-targets", - ] - - [[package]] - name = "percent-encoding" --version = "2.1.0" -+version = "2.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -- --[[package]] --name = "pest" --version = "2.1.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" --dependencies = [ -- "ucd-trie", --] -+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - - [[package]] - name = "phf" -@@ -1898,11 +2000,11 @@ dependencies = [ - - [[package]] - name = "phf_generator" --version = "0.10.0" -+version = "0.11.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -+checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" - dependencies = [ -- "phf_shared 0.10.0", -+ "phf_shared 0.11.3", - "rand 0.8.5", - ] - -@@ -1917,7 +2019,7 @@ dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", -- "syn 1.0.89", -+ "syn 1.0.109", - ] - - [[package]] -@@ -1926,43 +2028,43 @@ version = "0.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" - dependencies = [ -- "siphasher", -+ "siphasher 0.3.11", - ] - - [[package]] - name = "phf_shared" --version = "0.10.0" -+version = "0.11.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -+checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" - dependencies = [ -- "siphasher", -+ "siphasher 1.0.1", - ] - - [[package]] - name = "pin-project" --version = "1.0.10" -+version = "1.1.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" -+checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" - dependencies = [ - "pin-project-internal", - ] - - [[package]] - name = "pin-project-internal" --version = "1.0.10" -+version = "1.1.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" -+checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" - dependencies = [ - "proc-macro2", - "quote", -- "syn 1.0.89", -+ "syn 2.0.100", - ] - - [[package]] - name = "pin-project-lite" --version = "0.2.8" -+version = "0.2.16" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" -+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" - - [[package]] - name = "pin-utils" -@@ -1970,35 +2072,49 @@ version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -+[[package]] -+name = "piper" -+version = "0.2.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" -+dependencies = [ -+ "atomic-waker", -+ "fastrand 2.3.0", -+ "futures-io", -+] -+ - [[package]] - name = "pkg-config" --version = "0.3.30" -+version = "0.3.32" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" -+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" - - [[package]] - name = "png" --version = "0.17.7" -+version = "0.17.16" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" -+checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526" - dependencies = [ - "bitflags 1.3.2", - "crc32fast", -+ "fdeflate", - "flate2", - "miniz_oxide", - ] - - [[package]] - name = "polling" --version = "2.2.0" -+version = "3.7.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" -+checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" - dependencies = [ - "cfg-if", -- "libc", -- "log", -- "wepoll-ffi", -- "winapi", -+ "concurrent-queue", -+ "hermit-abi 0.4.0", -+ "pin-project-lite", -+ "rustix", -+ "tracing", -+ "windows-sys 0.59.0", - ] - - [[package]] -@@ -2014,9 +2130,12 @@ dependencies = [ - - [[package]] - name = "ppv-lite86" --version = "0.2.16" -+version = "0.2.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" -+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" -+dependencies = [ -+ "zerocopy", -+] - - [[package]] - name = "precomputed-hash" -@@ -2036,50 +2155,35 @@ dependencies = [ - - [[package]] - name = "proc-macro-crate" --version = "3.1.0" -+version = "3.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -+checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" - dependencies = [ - "toml_edit", - ] - - [[package]] --name = "proc-macro-error" --version = "1.0.4" -+name = "proc-macro-hack" -+version = "0.5.20+deprecated" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" --dependencies = [ -- "proc-macro-error-attr", -- "proc-macro2", -- "quote", -- "syn 1.0.89", -- "version_check", --] -+checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - - [[package]] --name = "proc-macro-error-attr" --version = "1.0.4" -+name = "proc-macro2" -+version = "1.0.95" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" - dependencies = [ -- "proc-macro2", -- "quote", -- "version_check", -+ "unicode-ident", - ] - - [[package]] --name = "proc-macro-hack" --version = "0.5.19" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" -- --[[package]] --name = "proc-macro2" --version = "1.0.79" -+name = "qoi" -+version = "0.4.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -+checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" - dependencies = [ -- "unicode-ident", -+ "bytemuck", - ] - - [[package]] -@@ -2090,9 +2194,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - - [[package]] - name = "quote" --version = "1.0.35" -+version = "1.0.40" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" - dependencies = [ - "proc-macro2", - ] -@@ -2119,7 +2223,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" - dependencies = [ - "libc", - "rand_chacha 0.3.1", -- "rand_core 0.6.3", -+ "rand_core 0.6.4", - ] - - [[package]] -@@ -2139,7 +2243,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" - dependencies = [ - "ppv-lite86", -- "rand_core 0.6.3", -+ "rand_core 0.6.4", - ] - - [[package]] -@@ -2153,11 +2257,11 @@ dependencies = [ - - [[package]] - name = "rand_core" --version = "0.6.3" -+version = "0.6.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" - dependencies = [ -- "getrandom 0.2.6", -+ "getrandom 0.2.16", - ] - - [[package]] -@@ -2184,48 +2288,55 @@ version = "0.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" - dependencies = [ -- "rand_core 0.6.3", -+ "rand_core 0.6.4", - ] - - [[package]] - name = "rayon" --version = "1.5.1" -+version = "1.10.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" -+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" - dependencies = [ -- "autocfg", -- "crossbeam-deque", - "either", - "rayon-core", - ] - - [[package]] - name = "rayon-core" --version = "1.9.1" -+version = "1.12.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" -+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" - dependencies = [ -- "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", -- "lazy_static", -- "num_cpus", - ] - - [[package]] - name = "redox_syscall" --version = "0.2.12" -+version = "0.5.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8ae183fc1b06c149f0c1793e1eb447c8b04bfe46d48e9e48bfb8d2d7ed64ecf0" -+checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3" - dependencies = [ -- "bitflags 1.3.2", -+ "bitflags 2.9.0", - ] - - [[package]] - name = "regex" --version = "1.5.5" -+version = "1.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" -+dependencies = [ -+ "aho-corasick", -+ "memchr", -+ "regex-automata", -+ "regex-syntax", -+] -+ -+[[package]] -+name = "regex-automata" -+version = "0.4.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" -+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" - dependencies = [ - "aho-corasick", - "memchr", -@@ -2234,9 +2345,9 @@ dependencies = [ - - [[package]] - name = "regex-syntax" --version = "0.6.25" -+version = "0.8.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" -+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" - - [[package]] - name = "rustc_version" -@@ -2249,49 +2360,52 @@ dependencies = [ - - [[package]] - name = "rustc_version" --version = "0.3.3" -+version = "0.4.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" - dependencies = [ -- "semver 0.11.0", -+ "semver 1.0.26", - ] - - [[package]] --name = "rustc_version" --version = "0.4.0" -+name = "rustix" -+version = "0.38.44" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" - dependencies = [ -- "semver 1.0.7", -+ "bitflags 2.9.0", -+ "errno", -+ "libc", -+ "linux-raw-sys", -+ "windows-sys 0.59.0", - ] - -+[[package]] -+name = "rustversion" -+version = "1.0.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" -+ - [[package]] - name = "ryu" --version = "1.0.9" -+version = "1.0.20" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" -+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" - - [[package]] - name = "schannel" --version = "0.1.19" -+version = "0.1.27" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" - dependencies = [ -- "lazy_static", -- "winapi", -+ "windows-sys 0.59.0", - ] - --[[package]] --name = "scoped_threadpool" --version = "0.1.9" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" -- - [[package]] - name = "scopeguard" --version = "1.1.0" -+version = "1.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - - [[package]] - name = "scraper" -@@ -2335,23 +2449,14 @@ version = "0.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" - dependencies = [ -- "semver-parser 0.7.0", -+ "semver-parser", - ] - - [[package]] - name = "semver" --version = "0.11.0" -+version = "1.0.26" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" --dependencies = [ -- "semver-parser 0.10.2", --] -- --[[package]] --name = "semver" --version = "1.0.7" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4" -+checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" - - [[package]] - name = "semver-parser" -@@ -2359,42 +2464,34 @@ version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - --[[package]] --name = "semver-parser" --version = "0.10.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" --dependencies = [ -- "pest", --] -- - [[package]] - name = "serde" --version = "1.0.136" -+version = "1.0.219" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" -+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" - dependencies = [ - "serde_derive", - ] - - [[package]] - name = "serde_derive" --version = "1.0.136" -+version = "1.0.219" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" -+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" - dependencies = [ - "proc-macro2", - "quote", -- "syn 1.0.89", -+ "syn 2.0.100", - ] - - [[package]] - name = "serde_json" --version = "1.0.79" -+version = "1.0.140" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" -+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" - dependencies = [ -- "itoa 1.0.1", -+ "itoa 1.0.15", -+ "memchr", - "ryu", - "serde", - ] -@@ -2410,6 +2507,15 @@ dependencies = [ - "thiserror", - ] - -+[[package]] -+name = "serde_spanned" -+version = "0.6.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" -+dependencies = [ -+ "serde", -+] -+ - [[package]] - name = "serde_urlencoded" - version = "0.7.1" -@@ -2417,7 +2523,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" - dependencies = [ - "form_urlencoded", -- "itoa 1.0.1", -+ "itoa 1.0.15", - "ryu", - "serde", - ] -@@ -2443,9 +2549,9 @@ dependencies = [ - - [[package]] - name = "sha1_smol" --version = "1.0.0" -+version = "1.0.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" -+checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" - - [[package]] - name = "sha2" -@@ -2481,17 +2587,29 @@ dependencies = [ - "url", - ] - -+[[package]] -+name = "shlex" -+version = "1.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -+ - [[package]] - name = "simd-adler32" --version = "0.3.4" -+version = "0.3.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "14a5df39617d7c8558154693a1bb8157a4aab8179209540cc0b10e5dc24e0b18" -+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - - [[package]] - name = "siphasher" --version = "0.3.10" -+version = "0.3.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" -+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" -+ -+[[package]] -+name = "siphasher" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" - - [[package]] - name = "sized-chunks" -@@ -2505,9 +2623,12 @@ dependencies = [ - - [[package]] - name = "slab" --version = "0.4.5" -+version = "0.4.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" -+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -+dependencies = [ -+ "autocfg", -+] - - [[package]] - name = "sluice" -@@ -2515,41 +2636,32 @@ version = "0.5.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" - dependencies = [ -- "async-channel", -+ "async-channel 1.9.0", - "futures-core", - "futures-io", - ] - - [[package]] - name = "smallvec" --version = "1.13.2" -+version = "1.15.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -+checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" - - [[package]] - name = "socket2" --version = "0.4.4" -+version = "0.5.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" -+checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef" - dependencies = [ - "libc", -- "winapi", --] -- --[[package]] --name = "spin" --version = "0.9.5" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7dccf47db1b41fa1573ed27ccf5e08e3ca771cb994f776668c5ebda893b248fc" --dependencies = [ -- "lock_api", -+ "windows-sys 0.52.0", - ] - - [[package]] - name = "spinning_top" --version = "0.2.4" -+version = "0.2.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "75adad84ee84b521fb2cca2d4fd0f1dab1d8d026bda3c5bea4ca63b5f9f9293c" -+checksum = "5b9eb1a2f4c41445a3a0ff9abc5221c5fcd28e1f13cd7c0397706f9ac938ddb0" - dependencies = [ - "lock_api", - ] -@@ -2593,7 +2705,7 @@ dependencies = [ - "quote", - "serde", - "serde_derive", -- "syn 1.0.89", -+ "syn 1.0.109", - ] - - [[package]] -@@ -2609,7 +2721,7 @@ dependencies = [ - "serde_derive", - "serde_json", - "sha1", -- "syn 1.0.89", -+ "syn 1.0.109", - ] - - [[package]] -@@ -2620,26 +2732,25 @@ checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - - [[package]] - name = "string_cache" --version = "0.8.4" -+version = "0.8.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" -+checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f" - dependencies = [ - "new_debug_unreachable", -- "once_cell", - "parking_lot", -- "phf_shared 0.10.0", -+ "phf_shared 0.11.3", - "precomputed-hash", - "serde", - ] - - [[package]] - name = "string_cache_codegen" --version = "0.5.2" -+version = "0.5.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -+checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0" - dependencies = [ -- "phf_generator 0.10.0", -- "phf_shared 0.10.0", -+ "phf_generator 0.11.3", -+ "phf_shared 0.11.3", - "proc-macro2", - "quote", - ] -@@ -2661,7 +2772,7 @@ dependencies = [ - "cfg-if", - "encoding_rs", - "futures-util", -- "getrandom 0.2.6", -+ "getrandom 0.2.16", - "http-client", - "http-types", - "log", -@@ -2675,44 +2786,61 @@ dependencies = [ - - [[package]] - name = "syn" --version = "1.0.89" -+version = "1.0.109" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ea297be220d52398dcc07ce15a209fce436d361735ac1db700cab3b6cdfb9f54" -+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" - dependencies = [ - "proc-macro2", - "quote", -- "unicode-xid", -+ "unicode-ident", - ] - - [[package]] - name = "syn" --version = "2.0.53" -+version = "2.0.100" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" -+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" - dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", - ] - -+[[package]] -+name = "synstructure" -+version = "0.13.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn 2.0.100", -+] -+ - [[package]] - name = "system-deps" --version = "6.0.2" -+version = "6.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a1a45a1c4c9015217e12347f2a411b57ce2c4fc543913b14b6fe40483328e709" -+checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" - dependencies = [ - "cfg-expr", -- "heck 0.4.0", -+ "heck", - "pkg-config", - "toml", - "version-compare", - ] - -+[[package]] -+name = "target-lexicon" -+version = "0.12.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" -+ - [[package]] - name = "temp-dir" --version = "0.1.11" -+version = "0.1.14" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" -+checksum = "bc1ee6eef34f12f765cb94725905c6312b6610ab2b0940889cfe58dae7bc3c72" - - [[package]] - name = "tendril" -@@ -2727,9 +2855,9 @@ dependencies = [ - - [[package]] - name = "termcolor" --version = "1.1.3" -+version = "1.4.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" - dependencies = [ - "winapi-util", - ] -@@ -2742,38 +2870,29 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" - - [[package]] - name = "thiserror" --version = "1.0.30" -+version = "1.0.69" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" -+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" - dependencies = [ - "thiserror-impl", - ] - - [[package]] - name = "thiserror-impl" --version = "1.0.30" -+version = "1.0.69" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" -+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" - dependencies = [ - "proc-macro2", - "quote", -- "syn 1.0.89", --] -- --[[package]] --name = "threadpool" --version = "1.8.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" --dependencies = [ -- "num_cpus", -+ "syn 2.0.100", - ] - - [[package]] - name = "tiff" --version = "0.8.1" -+version = "0.9.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" -+checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" - dependencies = [ - "flate2", - "jpeg-decoder", -@@ -2815,57 +2934,59 @@ dependencies = [ - "proc-macro2", - "quote", - "standback", -- "syn 1.0.89", -+ "syn 1.0.109", - ] - - [[package]] --name = "tinyvec" --version = "1.5.1" -+name = "tinystr" -+version = "0.7.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" -+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" - dependencies = [ -- "tinyvec_macros", -+ "displaydoc", -+ "zerovec", - ] - --[[package]] --name = "tinyvec_macros" --version = "0.1.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" -- - [[package]] - name = "toml" --version = "0.5.8" -+version = "0.8.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" -+checksum = "900f6c86a685850b1bc9f6223b20125115ee3f31e01207d81655bbcc0aea9231" - dependencies = [ - "serde", -+ "serde_spanned", -+ "toml_datetime", -+ "toml_edit", - ] - - [[package]] - name = "toml_datetime" --version = "0.6.5" -+version = "0.6.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -+checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3" -+dependencies = [ -+ "serde", -+] - - [[package]] - name = "toml_edit" --version = "0.21.1" -+version = "0.22.25" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -+checksum = "10558ed0bd2a1562e630926a2d1f0b98c827da99fabd3fe20920a59642504485" - dependencies = [ - "indexmap", -+ "serde", -+ "serde_spanned", - "toml_datetime", - "winnow", - ] - - [[package]] - name = "tracing" --version = "0.1.32" -+version = "0.1.41" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f" -+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" - dependencies = [ -- "cfg-if", - "log", - "pin-project-lite", - "tracing-attributes", -@@ -2874,22 +2995,22 @@ dependencies = [ - - [[package]] - name = "tracing-attributes" --version = "0.1.20" -+version = "0.1.28" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" -+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" - dependencies = [ - "proc-macro2", - "quote", -- "syn 1.0.89", -+ "syn 2.0.100", - ] - - [[package]] - name = "tracing-core" --version = "0.1.23" -+version = "0.1.33" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "aa31669fa42c09c34d94d8165dd2012e8ff3c66aca50f3bb226b68f216f2706c" -+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" - dependencies = [ -- "lazy_static", -+ "once_cell", - ] - - [[package]] -@@ -2904,57 +3025,27 @@ dependencies = [ - - [[package]] - name = "typenum" --version = "1.15.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" -- --[[package]] --name = "ucd-trie" --version = "0.1.3" -+version = "1.18.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" -+checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" - - [[package]] - name = "unicase" --version = "2.6.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" --dependencies = [ -- "version_check", --] -- --[[package]] --name = "unicode-bidi" --version = "0.3.7" -+version = "2.8.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" -+checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" - - [[package]] - name = "unicode-ident" --version = "1.0.11" -+version = "1.0.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" -- --[[package]] --name = "unicode-normalization" --version = "0.1.19" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" --dependencies = [ -- "tinyvec", --] -+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" - - [[package]] - name = "unicode-width" --version = "0.1.9" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" -- --[[package]] --name = "unicode-xid" --version = "0.2.2" -+version = "0.1.14" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" -+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" - - [[package]] - name = "universal-hash" -@@ -2968,13 +3059,12 @@ dependencies = [ - - [[package]] - name = "url" --version = "2.2.2" -+version = "2.5.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" -+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" - dependencies = [ - "form_urlencoded", - "idna", -- "matches", - "percent-encoding", - "serde", - ] -@@ -2985,15 +3075,23 @@ version = "0.7.6" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -+[[package]] -+name = "utf16_iter" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" -+ -+[[package]] -+name = "utf8_iter" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" -+ - [[package]] - name = "value-bag" --version = "1.0.0-alpha.8" -+version = "1.11.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "79923f7731dc61ebfba3633098bf3ac533bbd35ccd8c57e7088d9a5eebe0263f" --dependencies = [ -- "ctor", -- "version_check", --] -+checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5" - - [[package]] - name = "vcpkg" -@@ -3003,21 +3101,21 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - - [[package]] - name = "version-compare" --version = "0.1.0" -+version = "0.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73" -+checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" - - [[package]] - name = "version_check" --version = "0.9.4" -+version = "0.9.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - - [[package]] - name = "waker-fn" --version = "1.1.0" -+version = "1.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" -+checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" - - [[package]] - name = "wasi" -@@ -3027,52 +3125,54 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - - [[package]] - name = "wasi" --version = "0.10.2+wasi-snapshot-preview1" -+version = "0.11.0+wasi-snapshot-preview1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" -+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - - [[package]] - name = "wasm-bindgen" --version = "0.2.79" -+version = "0.2.100" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" -+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" - dependencies = [ - "cfg-if", -+ "once_cell", -+ "rustversion", - "wasm-bindgen-macro", - ] - - [[package]] - name = "wasm-bindgen-backend" --version = "0.2.79" -+version = "0.2.100" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" -+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" - dependencies = [ - "bumpalo", -- "lazy_static", - "log", - "proc-macro2", - "quote", -- "syn 1.0.89", -+ "syn 2.0.100", - "wasm-bindgen-shared", - ] - - [[package]] - name = "wasm-bindgen-futures" --version = "0.4.29" -+version = "0.4.50" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395" -+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" - dependencies = [ - "cfg-if", - "js-sys", -+ "once_cell", - "wasm-bindgen", - "web-sys", - ] - - [[package]] - name = "wasm-bindgen-macro" --version = "0.2.79" -+version = "0.2.100" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" -+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" - dependencies = [ - "quote", - "wasm-bindgen-macro-support", -@@ -3080,28 +3180,31 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-macro-support" --version = "0.2.79" -+version = "0.2.100" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" -+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" - dependencies = [ - "proc-macro2", - "quote", -- "syn 1.0.89", -+ "syn 2.0.100", - "wasm-bindgen-backend", - "wasm-bindgen-shared", - ] - - [[package]] - name = "wasm-bindgen-shared" --version = "0.2.79" -+version = "0.2.100" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" -+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" -+dependencies = [ -+ "unicode-ident", -+] - - [[package]] - name = "web-sys" --version = "0.3.56" -+version = "0.3.77" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" -+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" - dependencies = [ - "js-sys", - "wasm-bindgen", -@@ -3109,18 +3212,9 @@ dependencies = [ - - [[package]] - name = "weezl" --version = "0.1.5" -+version = "0.1.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d8b77fdfd5a253be4ab714e4ffa3c49caf146b4de743e97510c0656cf90f1e8e" -- --[[package]] --name = "wepoll-ffi" --version = "0.1.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" --dependencies = [ -- "cc", --] -+checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - - [[package]] - name = "winapi" -@@ -3140,11 +3234,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - - [[package]] - name = "winapi-util" --version = "0.1.5" -+version = "0.1.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" - dependencies = [ -- "winapi", -+ "windows-sys 0.59.0", - ] - - [[package]] -@@ -3155,127 +3249,199 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - - [[package]] - name = "windows-sys" --version = "0.32.0" -+version = "0.52.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" -+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" - dependencies = [ -- "windows_aarch64_msvc 0.32.0", -- "windows_i686_gnu 0.32.0", -- "windows_i686_msvc 0.32.0", -- "windows_x86_64_gnu 0.32.0", -- "windows_x86_64_msvc 0.32.0", -+ "windows-targets", - ] - - [[package]] - name = "windows-sys" --version = "0.52.0" -+version = "0.59.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" - dependencies = [ - "windows-targets", - ] - - [[package]] - name = "windows-targets" --version = "0.52.4" -+version = "0.52.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" -+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" - dependencies = [ - "windows_aarch64_gnullvm", -- "windows_aarch64_msvc 0.52.4", -- "windows_i686_gnu 0.52.4", -- "windows_i686_msvc 0.52.4", -- "windows_x86_64_gnu 0.52.4", -+ "windows_aarch64_msvc", -+ "windows_i686_gnu", -+ "windows_i686_gnullvm", -+ "windows_i686_msvc", -+ "windows_x86_64_gnu", - "windows_x86_64_gnullvm", -- "windows_x86_64_msvc 0.52.4", -+ "windows_x86_64_msvc", - ] - - [[package]] - name = "windows_aarch64_gnullvm" --version = "0.52.4" -+version = "0.52.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" -+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - - [[package]] - name = "windows_aarch64_msvc" --version = "0.32.0" -+version = "0.52.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" -+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - - [[package]] --name = "windows_aarch64_msvc" --version = "0.52.4" -+name = "windows_i686_gnu" -+version = "0.52.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" -+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - - [[package]] --name = "windows_i686_gnu" --version = "0.32.0" -+name = "windows_i686_gnullvm" -+version = "0.52.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" -+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - - [[package]] --name = "windows_i686_gnu" --version = "0.52.4" -+name = "windows_i686_msvc" -+version = "0.52.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" -+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - - [[package]] --name = "windows_i686_msvc" --version = "0.32.0" -+name = "windows_x86_64_gnu" -+version = "0.52.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" -+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - - [[package]] --name = "windows_i686_msvc" --version = "0.52.4" -+name = "windows_x86_64_gnullvm" -+version = "0.52.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" -+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - - [[package]] --name = "windows_x86_64_gnu" --version = "0.32.0" -+name = "windows_x86_64_msvc" -+version = "0.52.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" -+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - - [[package]] --name = "windows_x86_64_gnu" --version = "0.52.4" -+name = "winnow" -+version = "0.7.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" -+checksum = "6cb8234a863ea0e8cd7284fcdd4f145233eb00fee02bbdd9861aec44e6477bc5" -+dependencies = [ -+ "memchr", -+] - - [[package]] --name = "windows_x86_64_gnullvm" --version = "0.52.4" -+name = "write16" -+version = "1.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" -+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - - [[package]] --name = "windows_x86_64_msvc" --version = "0.32.0" -+name = "writeable" -+version = "0.5.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" -+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" - - [[package]] --name = "windows_x86_64_msvc" --version = "0.52.4" -+name = "yoke" -+version = "0.7.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" -+dependencies = [ -+ "serde", -+ "stable_deref_trait", -+ "yoke-derive", -+ "zerofrom", -+] -+ -+[[package]] -+name = "yoke-derive" -+version = "0.7.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn 2.0.100", -+ "synstructure", -+] -+ -+[[package]] -+name = "zerocopy" -+version = "0.8.25" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" -+checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" -+dependencies = [ -+ "zerocopy-derive", -+] - - [[package]] --name = "winnow" --version = "0.5.40" -+name = "zerocopy-derive" -+version = "0.8.25" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -+checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" - dependencies = [ -- "memchr", -+ "proc-macro2", -+ "quote", -+ "syn 2.0.100", -+] -+ -+[[package]] -+name = "zerofrom" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" -+dependencies = [ -+ "zerofrom-derive", -+] -+ -+[[package]] -+name = "zerofrom-derive" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn 2.0.100", -+ "synstructure", -+] -+ -+[[package]] -+name = "zerovec" -+version = "0.10.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" -+dependencies = [ -+ "yoke", -+ "zerofrom", -+ "zerovec-derive", -+] -+ -+[[package]] -+name = "zerovec-derive" -+version = "0.10.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn 2.0.100", - ] - - [[package]] - name = "zune-inflate" --version = "0.2.50" -+version = "0.2.54" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "589245df6230839c305984dcc0a8385cc72af1fd223f360ffd5d65efa4216d40" -+checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" - dependencies = [ - "simd-adler32", - ] From 6a27c2fefb983fb7d35deb04337d47eb34bacb2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 02:38:46 +0000 Subject: [PATCH 178/272] podman-compose: 1.3.0 -> 1.4.0 --- pkgs/applications/virtualization/podman-compose/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman-compose/default.nix b/pkgs/applications/virtualization/podman-compose/default.nix index 3de44cdc0039..7c5cecf27fd8 100644 --- a/pkgs/applications/virtualization/podman-compose/default.nix +++ b/pkgs/applications/virtualization/podman-compose/default.nix @@ -9,7 +9,7 @@ }: buildPythonApplication rec { - version = "1.3.0"; + version = "1.4.0"; pname = "podman-compose"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonApplication rec { repo = "podman-compose"; owner = "containers"; tag = "v${version}"; - hash = "sha256-0k+vJwWYEXQ6zxkcvjxBv9cq8nIBS15F7ul5VwqYtys="; + hash = "sha256-779L8fc5rxnkW5f4i/zgc8K9bEwKNKjw20cNlSwU/aA="; }; build-system = [ From 12513349a222bf665a20d188a597756be27ed384 Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 20 May 2025 02:58:13 +0000 Subject: [PATCH 179/272] beekeeper-studio: 5.2.7 -> 5.2.9 --- pkgs/by-name/be/beekeeper-studio/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/be/beekeeper-studio/package.nix b/pkgs/by-name/be/beekeeper-studio/package.nix index 4486fe2edc1c..384b206eb58f 100644 --- a/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/pkgs/by-name/be/beekeeper-studio/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "beekeeper-studio"; - version = "5.2.7"; + version = "5.2.9"; src = let @@ -44,8 +44,8 @@ stdenv.mkDerivation (finalAttrs: { fetchurl { url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${finalAttrs.version}/beekeeper-studio_${finalAttrs.version}_${arch}.deb"; hash = selectSystem { - x86_64-linux = "sha256-lP+8tX0NNsBDnrBvjJxu2PwVAMbtnnoc+oFteq6KECs="; - aarch64-linux = "sha256-pbVppWkXZb184icW9CevdNQ3FBC/Wpjr9BSd9fwbzCs="; + x86_64-linux = "sha256-iooZSiIkHfd3jSk+Pk0E7s/g51UzbyqyP8qnfes3mts="; + aarch64-linux = "sha256-zLkEMOJhckIM0qPCKBNUgFwYiF1YjJU4wKmiLJ1pzNg="; }; }; From 82b03d0e4da414332894506af33522d9a079de56 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 02:59:39 +0000 Subject: [PATCH 180/272] vimPlugins.nvim-spectre: 0-unstable-2025-04-28 -> 0-unstable-2025-05-13 --- .../vim/plugins/non-generated/nvim-spectre/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix index 450264c829eb..8e65813f68b8 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix @@ -7,12 +7,12 @@ vimUtils, }: let - version = "0-unstable-2025-04-28"; + version = "0-unstable-2025-05-13"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "197150cd3f30eeb1b3fd458339147533d91ac385"; - hash = "sha256-ATW1QJ2aXHcUtGK6MNLSq4VkML3FLQphVcLqfzoX9PI="; + rev = "72f56f7585903cd7bf92c665351aa585e150af0f"; + hash = "sha256-WPEizIClDmseDEhomCasLx/zfAMT7lq7ZBnfc/a8CuA="; }; spectre_oxi = rustPlatform.buildRustPackage { From dbd06b2fbf88cf94f7b96c8af38c8458dca2c246 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Tue, 20 May 2025 11:11:29 +0800 Subject: [PATCH 181/272] uv: 0.7.5 -> 0.7.6 --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index a4a1e60038f1..cad2c65c315d 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,17 +18,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-sE0d18lA9pA/EpzwXZ8RSucQ5eVtnkyoTzkrB5sAaO4="; + hash = "sha256-zFVVvPPb1UM71u9QFphp9YFWgmvYemAHouCttNnQWMk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-xrusRs2PEEHzEOTvJ8vcpn/uxbeW5APcFbJZNZPzs1U="; + cargoHash = "sha256-aeOT6HO12J700CF7o2LiqUy6pl0Fzb0OLxHt+G4HW/k="; buildInputs = [ rust-jemalloc-sys From 0a34ae39914ed02556daecc3b212b83f26708329 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 03:25:04 +0000 Subject: [PATCH 182/272] claude-code: 0.2.109 -> 0.2.122 --- pkgs/by-name/cl/claude-code/package-lock.json | 459 +----------------- pkgs/by-name/cl/claude-code/package.nix | 6 +- 2 files changed, 7 insertions(+), 458 deletions(-) diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 70398c0cafce..e2fdd266549a 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -5,18 +5,15 @@ "packages": { "": { "dependencies": { - "@anthropic-ai/claude-code": "^0.2.109" + "@anthropic-ai/claude-code": "^0.2.122" } }, "node_modules/@anthropic-ai/claude-code": { - "version": "0.2.109", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.109.tgz", - "integrity": "sha512-dxOUgATehMCBZHzC47H3i6CCAf2YlXQMcTxrfzl0XEkwqEhbT8EzwWVbqDVc7n/eLykY2SK7xf5hD1iK8kr/dw==", + "version": "0.2.122", + "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.122.tgz", + "integrity": "sha512-q9XnW6a4btqHM2XYxkcl2d7dDNRTX8pvaeisiNWYzAOSKC+wUfOrkioUUS3BG+i6sNtJB03jPKJdqvEvtXbZjw==", "hasInstallScript": true, "license": "SEE LICENSE IN README.md", - "dependencies": { - "better-sqlite3": "^11.9.1" - }, "bin": { "claude": "cli.js" }, @@ -162,454 +159,6 @@ "funding": { "url": "https://opencollective.com/libvips" } - }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/better-sqlite3": { - "version": "11.9.1", - "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-11.9.1.tgz", - "integrity": "sha512-Ba0KR+Fzxh2jDRhdg6TSH0SJGzb8C0aBY4hR8w8madIdIzzC6Y1+kx5qR6eS1Z+Gy20h6ZU28aeyg0z1VIrShQ==", - "hasInstallScript": true, - "license": "MIT", - "dependencies": { - "bindings": "^1.5.0", - "prebuild-install": "^7.1.1" - } - }, - "node_modules/bindings": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", - "license": "MIT", - "dependencies": { - "file-uri-to-path": "1.0.0" - } - }, - "node_modules/bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "license": "MIT", - "dependencies": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "node_modules/chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", - "license": "ISC" - }, - "node_modules/decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "license": "MIT", - "dependencies": { - "mimic-response": "^3.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "license": "MIT", - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/detect-libc": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz", - "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==", - "license": "Apache-2.0", - "engines": { - "node": ">=8" - } - }, - "node_modules/end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "license": "MIT", - "dependencies": { - "once": "^1.4.0" - } - }, - "node_modules/expand-template": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", - "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", - "license": "(MIT OR WTFPL)", - "engines": { - "node": ">=6" - } - }, - "node_modules/file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", - "license": "MIT" - }, - "node_modules/fs-constants": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", - "license": "MIT" - }, - "node_modules/github-from-package": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", - "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", - "license": "MIT" - }, - "node_modules/ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "BSD-3-Clause" - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "license": "ISC" - }, - "node_modules/ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "license": "ISC" - }, - "node_modules/mimic-response": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/mkdirp-classic": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", - "license": "MIT" - }, - "node_modules/napi-build-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz", - "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==", - "license": "MIT" - }, - "node_modules/node-abi": { - "version": "3.74.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.74.0.tgz", - "integrity": "sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w==", - "license": "MIT", - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "license": "ISC", - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/prebuild-install": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz", - "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==", - "license": "MIT", - "dependencies": { - "detect-libc": "^2.0.0", - "expand-template": "^2.0.3", - "github-from-package": "0.0.0", - "minimist": "^1.2.3", - "mkdirp-classic": "^0.5.3", - "napi-build-utils": "^2.0.0", - "node-abi": "^3.3.0", - "pump": "^3.0.0", - "rc": "^1.2.7", - "simple-get": "^4.0.0", - "tar-fs": "^2.0.0", - "tunnel-agent": "^0.6.0" - }, - "bin": { - "prebuild-install": "bin.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/pump": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz", - "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==", - "license": "MIT", - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "node_modules/rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "license": "(BSD-2-Clause OR MIT OR Apache-2.0)", - "dependencies": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "bin": { - "rc": "cli.js" - } - }, - "node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/simple-concat": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", - "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/simple-get": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", - "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "decompress-response": "^6.0.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" - } - }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, - "node_modules/strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/tar-fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.2.tgz", - "integrity": "sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==", - "license": "MIT", - "dependencies": { - "chownr": "^1.1.1", - "mkdirp-classic": "^0.5.2", - "pump": "^3.0.0", - "tar-stream": "^2.1.4" - } - }, - "node_modules/tar-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "license": "MIT", - "dependencies": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", - "license": "Apache-2.0", - "dependencies": { - "safe-buffer": "^5.0.1" - }, - "engines": { - "node": "*" - } - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "license": "MIT" - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "license": "ISC" } } } diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 120d73b335f4..c395e785c544 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "claude-code"; - version = "0.2.109"; + version = "0.2.122"; nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-XANo3GKiD5n66GZrB+gZ15o2zTAOKkjcFNbGE3TT1NA="; + hash = "sha256-9w1wjuOTSphEfgKfNJhDFiTKuIJqfV6Bz4XEYXMIaGE="; }; - npmDepsHash = "sha256-u5AZXNlN/NAag+35uz3rzLh6ItbKAdV8RSSjzCGk6uA="; + npmDepsHash = "sha256-71YPsgeI8bmb+wwFHS5XOXKJXsagWZj+hBf2T/+GYMU="; postPatch = '' cp ${./package-lock.json} package-lock.json From 28ea08fde964003d2ac8b6e796f98c7f3bc23ead Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 19 May 2025 14:43:18 +0200 Subject: [PATCH 183/272] linux/hardened/patches/6.14: init at v6.14.6-hardened1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Fabián Heredia Montiel --- nixos/tests/kernel-generic.nix | 1 + pkgs/os-specific/linux/kernel/hardened/patches.json | 10 ++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 2 ++ 4 files changed, 15 insertions(+) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 2a1ab38267a3..34e0597777a6 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -42,6 +42,7 @@ let linux_6_6_hardened linux_6_12_hardened linux_6_13_hardened + linux_6_14_hardened linux_rt_5_4 linux_rt_5_10 linux_rt_5_15 diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 8826923a34cf..a8827cdb2ea2 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -59,6 +59,16 @@ "sha256": "0hhj49k3ksjcp0dg5yiahqzryjfdpr9c1a9ph6j9slzmkikbn7v1", "version": "6.13.12" }, + "6.14": { + "patch": { + "extra": "-hardened1", + "name": "linux-hardened-v6.14.6-hardened1.patch", + "sha256": "0ph6kkgbc0pk83xisggk7xsacryqlzkxgc1nxx590lg285bh33ld", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.14.6-hardened1/linux-hardened-v6.14.6-hardened1.patch" + }, + "sha256": "1acpjxscw5nvgp19jzd29zhl1c6wdzx0bxp4yy0hy8z2k0cpz091", + "version": "6.14.6" + }, "6.6": { "patch": { "extra": "-hardened1", diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ba7ce5705b1..d16657a0a59b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11200,6 +11200,8 @@ with pkgs; linux_6_12_hardened = linuxKernel.kernels.linux_6_12_hardened; linuxPackages_6_13_hardened = linuxKernel.packages.linux_6_13_hardened; linux_6_13_hardened = linuxKernel.kernels.linux_6_13_hardened; + linuxPackages_6_14_hardened = linuxKernel.packages.linux_6_14_hardened; + linux_6_14_hardened = linuxKernel.kernels.linux_6_14_hardened; # GNU Linux-libre kernels linuxPackages-libre = linuxKernel.packages.linux_libre; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 900ef2f76a26..a700297a9c97 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -327,6 +327,7 @@ in linux_6_6_hardened = hardenedKernelFor kernels.linux_6_6 { }; linux_6_12_hardened = hardenedKernelFor kernels.linux_6_12 { }; linux_6_13_hardened = hardenedKernelFor kernels.linux_6_13 { }; + linux_6_14_hardened = hardenedKernelFor kernels.linux_6_14 { }; } // lib.optionalAttrs config.allowAliases { @@ -793,6 +794,7 @@ in linux_6_6_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_6_hardened); linux_6_12_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_12_hardened); linux_6_13_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_13_hardened); + linux_6_14_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_14_hardened); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); From 43bfaecca6ba600c7fe457030c961ac9d3c110ea Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 19 May 2025 14:48:58 +0200 Subject: [PATCH 184/272] linux/hardened/patches/6.6: v6.6.83-hardened1 -> v6.6.90-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a8827cdb2ea2..1acd79c2ca82 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -72,11 +72,11 @@ "6.6": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.6.83-hardened1.patch", - "sha256": "0wzgkj4ypa3clbzq40jkm3qjhbnj8wj48wc9vxx8v15gl4rppgga", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.83-hardened1/linux-hardened-v6.6.83-hardened1.patch" + "name": "linux-hardened-v6.6.90-hardened1.patch", + "sha256": "0w43dv0179drcg7w7j6gq8l6di0aj4rhfphyz7xlkx6x54jlxbvv", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.90-hardened1/linux-hardened-v6.6.90-hardened1.patch" }, - "sha256": "0262q81mwhy8plql8hnnfvagp460vfl127kaayya113l7gkbnjw9", - "version": "6.6.83" + "sha256": "0kh1ax0j0vl0n267cpij5lf170ab1fg0j6gjzvzc2a8ncx46g1gz", + "version": "6.6.90" } } From 43531951ab3a18090f9c8ae7e62b8bcd9687d302 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 04:13:09 +0000 Subject: [PATCH 185/272] pinact: 3.0.5 -> 3.1.2 --- pkgs/by-name/pi/pinact/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix index a13b2f069682..399c9caee856 100644 --- a/pkgs/by-name/pi/pinact/package.nix +++ b/pkgs/by-name/pi/pinact/package.nix @@ -8,19 +8,19 @@ let pname = "pinact"; - version = "3.0.5"; + version = "3.1.2"; src = fetchFromGitHub { owner = "suzuki-shunsuke"; repo = "pinact"; tag = "v${version}"; - hash = "sha256-p8GOXx++wcUrQATlojx0D4ymlPFw9TCqL6YGSTOaRDo="; + hash = "sha256-5jJzlMMpfk9fFDoqR0NJNacquZ4Zma0YF/pi80Miv0Y="; }; mainProgram = "pinact"; in buildGoModule { inherit pname version src; - vendorHash = "sha256-+iYNducL+tX34L5VlisqeNwvJUcuOAkEWDk/2JbfC0Q="; + vendorHash = "sha256-kK4r0mCktlbhJr6iHD0Q/k1DralieN2AUg+zREZ06DA="; env.CGO_ENABLED = 0; From 9beb192ef839fb6e2733ce09b0753725ddde72e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 04:49:20 +0000 Subject: [PATCH 186/272] pixi: 0.46.0 -> 0.47.0 --- pkgs/by-name/pi/pixi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index d67740eb75f2..8080506d9aec 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pixi"; - version = "0.46.0"; + version = "0.47.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "pixi"; tag = "v${finalAttrs.version}"; - hash = "sha256-HkaDc7RauVhuuu4R88xlgiAM9pv6RPgyvaVoPO0PHqA="; + hash = "sha256-ndNwtCKAU/59bq6uDlaxb+24DG2yKD7NyfwgBAlHMtg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-0X+3/fQLgUSSnDVAociKqk4rJfKHJtKdXIIaSUzI18g="; + cargoHash = "sha256-Q82CD/byqXAqJpO0izIwBD6lYpoZNJoWqDCciRecZnY="; nativeBuildInputs = [ pkg-config From c43008108b0e0572000846e98503ea609d97380e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 04:50:51 +0000 Subject: [PATCH 187/272] vscode-extensions.eamodio.gitlens: 17.0.3 -> 17.1.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c9ef8e132494..adff95e8ef26 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1587,8 +1587,8 @@ let # semver scheme, contrary to preview versions which are listed on # the VSCode Marketplace and use a calver scheme. We should avoid # using preview versions, because they expire after two weeks. - version = "17.0.3"; - hash = "sha256-jU1N5tJ4V3jzSNW9oE8AH5PRhTmsiIGnu65+IH5NxO0="; + version = "17.1.0"; + hash = "sha256-WPSMf1yLXSDqImpMTxn1eXcSrimVSVjjaXDzFMQ/l0E="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; From 65c2222c22d35803ec859d9b21749a003d73f5c0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 20 May 2025 06:27:32 +0100 Subject: [PATCH 188/272] flatpak: 1.16.0 -> 1.16.1 Changes: https://github.com/flatpak/flatpak/releases/tag/1.16.1 --- pkgs/by-name/fl/flatpak/package.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index 42620c2c4b7d..382b91393d8d 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -14,7 +14,6 @@ docbook-xsl-nons, docbook_xml_dtd_45, fetchurl, - fetchpatch, fuse3, gdk-pixbuf, gettext, @@ -81,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "flatpak"; - version = "1.16.0"; + version = "1.16.1"; # TODO: split out lib once we figure out what to do with triggerdir outputs = @@ -100,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz"; - hash = "sha256-ywrFZa3LYhJ8bRHtUO5wRNaoNvppw1Sy9LZAoiv6Syo="; + hash = "sha256-K0fo8tkNNdKTOe144abquzbu+pz6WlyjsNHydQLENnU="; }; patches = @@ -121,12 +120,6 @@ stdenv.mkDerivation (finalAttrs: { # The icon validator needs to access the gdk-pixbuf loaders in the Nix store # and cannot bind FHS paths since those are not available on NixOS. finalAttrs.passthru.icon-validator-patch - - (fetchpatch { - name = "static.patch"; - url = "https://github.com/flatpak/flatpak/commit/114c22e814fc28243585915321b8e943471c377f.patch"; - hash = "sha256-3JLzG74myBTssXQau0Ei5rpthy93Va7xb2MHRnJ3kaI="; - }) ] ++ lib.optionals finalAttrs.doCheck [ # Hardcode paths used by tests and change test runtime generation to use files from Nix store. From b0713aca86c8e04e52351846be23d74c95eea5a1 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Tue, 20 May 2025 14:27:06 +0900 Subject: [PATCH 189/272] pinact: prefer finalAttrs --- pkgs/by-name/pi/pinact/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix index 399c9caee856..0056403c7af7 100644 --- a/pkgs/by-name/pi/pinact/package.nix +++ b/pkgs/by-name/pi/pinact/package.nix @@ -7,18 +7,18 @@ }: let + mainProgram = "pinact"; +in +buildGoModule (finalAttrs: { pname = "pinact"; version = "3.1.2"; + src = fetchFromGitHub { owner = "suzuki-shunsuke"; repo = "pinact"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5jJzlMMpfk9fFDoqR0NJNacquZ4Zma0YF/pi80Miv0Y="; }; - mainProgram = "pinact"; -in -buildGoModule { - inherit pname version src; vendorHash = "sha256-kK4r0mCktlbhJr6iHD0Q/k1DralieN2AUg+zREZ06DA="; @@ -40,7 +40,7 @@ buildGoModule { ldflags = [ "-s" "-w" - "-X main.version=${version} -X main.commit=v${version}" + "-X main.version=${finalAttrs.version} -X main.commit=v${finalAttrs.version}" ]; subPackages = [ @@ -51,8 +51,8 @@ buildGoModule { inherit mainProgram; description = "Pin GitHub Actions versions"; homepage = "https://github.com/suzuki-shunsuke/pinact"; - changelog = "https://github.com/suzuki-shunsuke/pinact/releases/tag/v${version}"; + changelog = "https://github.com/suzuki-shunsuke/pinact/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ kachick ]; }; -} +}) From 7dec5f132bc146c508c2fe13081f4b02bd614668 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Tue, 20 May 2025 14:32:28 +0900 Subject: [PATCH 190/272] pinact: add shell completions --- pkgs/by-name/pi/pinact/package.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix index 0056403c7af7..81849bb79419 100644 --- a/pkgs/by-name/pi/pinact/package.nix +++ b/pkgs/by-name/pi/pinact/package.nix @@ -1,7 +1,9 @@ { lib, + stdenv, fetchFromGitHub, buildGoModule, + installShellFiles, versionCheckHook, nix-update-script, }: @@ -26,6 +28,17 @@ buildGoModule (finalAttrs: { doCheck = true; + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd '${mainProgram}' \ + --bash <("$out/bin/${mainProgram}" completion bash) \ + --zsh <("$out/bin/${mainProgram}" completion zsh) \ + --fish <("$out/bin/${mainProgram}" completion fish) + ''; + nativeInstallCheckInputs = [ versionCheckHook ]; From fe586a5d59ebb319a7557c83ac44a47428701fdc Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Tue, 13 May 2025 07:14:16 +0100 Subject: [PATCH 191/272] doc/packages: add treefmt section --- doc/packages/index.md | 1 + doc/packages/treefmt.section.md | 8 ++++++++ doc/redirects.json | 3 +++ 3 files changed, 12 insertions(+) create mode 100644 doc/packages/treefmt.section.md diff --git a/doc/packages/index.md b/doc/packages/index.md index 5484ac4400df..35e2656ab670 100644 --- a/doc/packages/index.md +++ b/doc/packages/index.md @@ -25,6 +25,7 @@ nginx.section.md opengl.section.md shell-helpers.section.md python-tree-sitter.section.md +treefmt.section.md steam.section.md cataclysm-dda.section.md urxvt.section.md diff --git a/doc/packages/treefmt.section.md b/doc/packages/treefmt.section.md new file mode 100644 index 000000000000..aaf0ac69346b --- /dev/null +++ b/doc/packages/treefmt.section.md @@ -0,0 +1,8 @@ +# treefmt {#treefmt} + +[treefmt](https://github.com/numtide/treefmt) streamlines the process of applying formatters to your project, making it a breeze with just one command line. + +The [`treefmt` package](https://search.nixos.org/packages?channel=unstable&show=treefmt) +provides functions for configuring treefmt using the module system. + +Alternatively, treefmt can be configured using [treefmt-nix](https://github.com/numtide/treefmt-nix). diff --git a/doc/redirects.json b/doc/redirects.json index 598f73abc37d..362d0a197689 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -483,6 +483,9 @@ "tester-testEqualArrayOrMap-return": [ "index.html#tester-testEqualArrayOrMap-return" ], + "treefmt": [ + "index.html#treefmt" + ], "typst": [ "index.html#typst", "doc/languages-frameworks/typst.section.md#typst" From 301824d21698e21025b6136e66833fe3e5b18655 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Wed, 14 May 2025 07:20:21 +0100 Subject: [PATCH 192/272] doc/packages/treefmt: add function reference docs Add a `treefmt.functionsDoc` passthru, which is included on the treefmt section of the nixpkgs manual. This generates reference docs for functions defined in `pkgs/by-name/tr/treefmt/lib.nix`, using `nixdoc`. --- doc/doc-support/package.nix | 2 ++ doc/packages/treefmt.section.md | 6 +++++- doc/redirects.json | 12 ++++++++++++ pkgs/by-name/tr/treefmt/functions-doc.nix | 19 +++++++++++++++++++ pkgs/by-name/tr/treefmt/package.nix | 3 +++ 5 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/tr/treefmt/functions-doc.nix diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix index db8066c8dc56..89e03240cee9 100644 --- a/doc/doc-support/package.nix +++ b/doc/doc-support/package.nix @@ -14,6 +14,7 @@ nixpkgs ? { }, markdown-code-runner, roboto, + treefmt, }: stdenvNoCC.mkDerivation ( @@ -47,6 +48,7 @@ stdenvNoCC.mkDerivation ( postPatch = '' ln -s ${optionsJSON}/share/doc/nixos/options.json ./config-options.json + ln -s ${treefmt.functionsDoc.markdown} ./packages/treefmt-functions.section.md ''; buildPhase = '' diff --git a/doc/packages/treefmt.section.md b/doc/packages/treefmt.section.md index aaf0ac69346b..873f93ecd657 100644 --- a/doc/packages/treefmt.section.md +++ b/doc/packages/treefmt.section.md @@ -3,6 +3,10 @@ [treefmt](https://github.com/numtide/treefmt) streamlines the process of applying formatters to your project, making it a breeze with just one command line. The [`treefmt` package](https://search.nixos.org/packages?channel=unstable&show=treefmt) -provides functions for configuring treefmt using the module system. +provides functions for configuring treefmt using the module system, which are [documented below](#sec-functions-library-treefmt). Alternatively, treefmt can be configured using [treefmt-nix](https://github.com/numtide/treefmt-nix). + +```{=include=} sections auto-id-prefix=auto-generated-treefmt-functions +treefmt-functions.section.md +``` diff --git a/doc/redirects.json b/doc/redirects.json index 362d0a197689..30239175f49a 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -72,6 +72,15 @@ "part-toolchains": [ "index.html#part-toolchains" ], + "pkgs.treefmt.buildConfig": [ + "index.html#pkgs.treefmt.buildConfig" + ], + "pkgs.treefmt.evalConfig": [ + "index.html#pkgs.treefmt.evalConfig" + ], + "pkgs.treefmt.withConfig": [ + "index.html#pkgs.treefmt.withConfig" + ], "preface": [ "index.html#preface" ], @@ -111,6 +120,9 @@ "sec-building-packages-with-llvm-using-clang-stdenv": [ "index.html#sec-building-packages-with-llvm-using-clang-stdenv" ], + "sec-functions-library-treefmt": [ + "index.html#sec-functions-library-treefmt" + ], "sec-inkscape": [ "index.html#sec-inkscape" ], diff --git a/pkgs/by-name/tr/treefmt/functions-doc.nix b/pkgs/by-name/tr/treefmt/functions-doc.nix new file mode 100644 index 000000000000..df67d902aba4 --- /dev/null +++ b/pkgs/by-name/tr/treefmt/functions-doc.nix @@ -0,0 +1,19 @@ +{ + nixdoc, + runCommand, +}: +{ + markdown = + runCommand "treefmt-functions-doc" + { + nativeBuildInputs = [ nixdoc ]; + } + '' + nixdoc --file ${./lib.nix} \ + --description "Functions Reference" \ + --prefix "pkgs" \ + --category "treefmt" \ + --anchor-prefix "" \ + > $out + ''; +} diff --git a/pkgs/by-name/tr/treefmt/package.nix b/pkgs/by-name/tr/treefmt/package.nix index 1a4873157f0c..08ca96eced1f 100644 --- a/pkgs/by-name/tr/treefmt/package.nix +++ b/pkgs/by-name/tr/treefmt/package.nix @@ -36,6 +36,9 @@ buildGoModule rec { ; tests = callPackages ./tests.nix { }; + + # Documentation for functions defined in `./lib.nix` + functionsDoc = callPackages ./functions-doc.nix { }; }; meta = { From 96f041725f6e92f7159b6d2913f07c18101d92dc Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Wed, 14 May 2025 07:20:21 +0100 Subject: [PATCH 193/272] doc/packages/treefmt: add location to function reference docs Get the function's source code location using `unsafeGetAttrPos` and pass that to `nixdoc` so that links to definitions are included in the docs. --- pkgs/by-name/tr/treefmt/functions-doc.nix | 38 +++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/pkgs/by-name/tr/treefmt/functions-doc.nix b/pkgs/by-name/tr/treefmt/functions-doc.nix index df67d902aba4..86dc23b226ea 100644 --- a/pkgs/by-name/tr/treefmt/functions-doc.nix +++ b/pkgs/by-name/tr/treefmt/functions-doc.nix @@ -1,8 +1,45 @@ { + lib, + writers, nixdoc, runCommand, + treefmt, }: +let + root = toString ./.; + revision = lib.trivial.revisionWithDefault "master"; + removeRoot = file: lib.removePrefix "/" (lib.removePrefix root file); + + # Import and apply `./lib.nix`, which contains treefmt's public functions + # + # NOTE: we cannot access them via `treefmt.passthru` or `callPackages ./lib.nix { }`, + # because that would be opaque to `unsafeGetAttrPos`. + attrs = + let + fn = import ./lib.nix; + args = builtins.mapAttrs (_: _: null) (builtins.functionArgs fn); + in + fn args; +in { + locations = lib.pipe attrs [ + builtins.attrNames + (builtins.map ( + name: + let + pos = builtins.unsafeGetAttrPos name attrs; + file = removeRoot pos.file; + line = toString pos.line; + subpath = "pkgs/by-name/tr/treefmt/${file}"; + url = "https://github.com/NixOS/nixpkgs/blob/${revision}/${subpath}#L${line}"; + in + assert lib.hasPrefix root pos.file; + lib.nameValuePair "pkgs.treefmt.${name}" "[${subpath}:${line}](${url}) in ``" + )) + builtins.listToAttrs + (writers.writeJSON "treefmt-function-locations") + ]; + markdown = runCommand "treefmt-functions-doc" { @@ -10,6 +47,7 @@ } '' nixdoc --file ${./lib.nix} \ + --locs ${treefmt.functionsDoc.locations} \ --description "Functions Reference" \ --prefix "pkgs" \ --category "treefmt" \ From 4c638c27356b52badabedfe2e40b220fced821b2 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Tue, 13 May 2025 07:15:15 +0100 Subject: [PATCH 194/272] doc/packages/treefmt: add option reference docs Add a `treefmt.optionsDoc` passthru, which is included on the treefmt section of the nixpkgs manual. This generates reference docs for options declared in `treefmt.evalConfig`. --- doc/doc-support/package.nix | 1 + doc/packages/treefmt.section.md | 13 ++++++++++- doc/redirects.json | 3 +++ pkgs/by-name/tr/treefmt/lib.nix | 16 +++++-------- pkgs/by-name/tr/treefmt/options-doc.nix | 31 +++++++++++++++++++++++++ pkgs/by-name/tr/treefmt/package.nix | 3 +++ 6 files changed, 56 insertions(+), 11 deletions(-) create mode 100644 pkgs/by-name/tr/treefmt/options-doc.nix diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix index 89e03240cee9..65fb0fb38ed7 100644 --- a/doc/doc-support/package.nix +++ b/doc/doc-support/package.nix @@ -49,6 +49,7 @@ stdenvNoCC.mkDerivation ( postPatch = '' ln -s ${optionsJSON}/share/doc/nixos/options.json ./config-options.json ln -s ${treefmt.functionsDoc.markdown} ./packages/treefmt-functions.section.md + ln -s ${treefmt.optionsDoc.optionsJSON}/share/doc/nixos/options.json ./treefmt-options.json ''; buildPhase = '' diff --git a/doc/packages/treefmt.section.md b/doc/packages/treefmt.section.md index 873f93ecd657..fbf38f5eb821 100644 --- a/doc/packages/treefmt.section.md +++ b/doc/packages/treefmt.section.md @@ -3,10 +3,21 @@ [treefmt](https://github.com/numtide/treefmt) streamlines the process of applying formatters to your project, making it a breeze with just one command line. The [`treefmt` package](https://search.nixos.org/packages?channel=unstable&show=treefmt) -provides functions for configuring treefmt using the module system, which are [documented below](#sec-functions-library-treefmt). +provides functions for configuring treefmt using the module system, which are [documented below](#sec-functions-library-treefmt), along with [their options](#sec-treefmt-options-reference). Alternatively, treefmt can be configured using [treefmt-nix](https://github.com/numtide/treefmt-nix). ```{=include=} sections auto-id-prefix=auto-generated-treefmt-functions treefmt-functions.section.md ``` + +## Options Reference {#sec-treefmt-options-reference} + +The following attributes can be passed to [`withConfig`](#pkgs.treefmt.withConfig) or [`evalConfig`](#pkgs.treefmt.evalConfig): + +```{=include=} options +id-prefix: opt-treefmt- +list-id: configuration-variable-list +source: ../treefmt-options.json +``` + diff --git a/doc/redirects.json b/doc/redirects.json index 30239175f49a..1bcf2a8bf52c 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -420,6 +420,9 @@ "sec-tools-of-stdenv": [ "index.html#sec-tools-of-stdenv" ], + "sec-treefmt-options-reference": [ + "index.html#sec-treefmt-options-reference" + ], "ssec-cosmic-common-issues": [ "index.html#ssec-cosmic-common-issues" ], diff --git a/pkgs/by-name/tr/treefmt/lib.nix b/pkgs/by-name/tr/treefmt/lib.nix index a9b06eae4f27..c5eb56d3c138 100644 --- a/pkgs/by-name/tr/treefmt/lib.nix +++ b/pkgs/by-name/tr/treefmt/lib.nix @@ -15,11 +15,9 @@ # Inputs - `module` - : A treefmt module, configuring options that include: - - `name`: `String` (default `"treefmt-with-config"`) - - `settings`: `Module` (default `{ }`) - - `runtimeInputs`: `[Derivation]` (default `[ ]`) + : A treefmt module. See [options reference]. + + [options reference]: https://nixos.org/manual/nixpkgs/unstable#sec-treefmt-options-reference */ evalConfig = module: @@ -51,11 +49,9 @@ # Inputs - `module` - : A treefmt module, configuring options that include: - - `name`: `String` (default `"treefmt-with-config"`) - - `settings`: `Module` (default `{ }`) - - `runtimeInputs`: `[Derivation]` (default `[ ]`) + : A treefmt module. See [options reference]. + + [options reference]: https://nixos.org/manual/nixpkgs/unstable#sec-treefmt-options-reference */ withConfig = module: diff --git a/pkgs/by-name/tr/treefmt/options-doc.nix b/pkgs/by-name/tr/treefmt/options-doc.nix new file mode 100644 index 000000000000..f9e51ec0dff1 --- /dev/null +++ b/pkgs/by-name/tr/treefmt/options-doc.nix @@ -0,0 +1,31 @@ +# To build this derivation, run `nix-build -A treefmt.optionsDoc` +{ + lib, + treefmt, + nixosOptionsDoc, +}: + +let + configuration = treefmt.evalConfig [ ]; + + root = toString configuration._module.specialArgs.modulesPath; + revision = lib.trivial.revisionWithDefault "master"; + removeRoot = file: lib.removePrefix "/" (lib.removePrefix root file); + + transformDeclaration = + file: + let + fileStr = toString file; + subpath = "pkgs/by-name/tr/treefmt/modules/" + removeRoot fileStr; + in + assert lib.hasPrefix root fileStr; + { + url = "https://github.com/NixOS/nixpkgs/blob/${revision}/${subpath}"; + name = subpath; + }; +in +nixosOptionsDoc { + documentType = "none"; + options = builtins.removeAttrs configuration.options [ "_module" ]; + transformOptions = opt: opt // { declarations = map transformDeclaration opt.declarations; }; +} diff --git a/pkgs/by-name/tr/treefmt/package.nix b/pkgs/by-name/tr/treefmt/package.nix index 08ca96eced1f..ab9c136ac434 100644 --- a/pkgs/by-name/tr/treefmt/package.nix +++ b/pkgs/by-name/tr/treefmt/package.nix @@ -39,6 +39,9 @@ buildGoModule rec { # Documentation for functions defined in `./lib.nix` functionsDoc = callPackages ./functions-doc.nix { }; + + # Documentation for options declared in `treefmt.evalConfig` configurations + optionsDoc = callPackages ./options-doc.nix { }; }; meta = { From 6e5c68be85c6c626ff52cbcdda655d5cf05ea344 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Mon, 19 May 2025 22:13:58 +0100 Subject: [PATCH 195/272] treefmt: improve how doc-comments render in the manual 1. Use internal links for other manual sections 2. Fix definition-list syntax Currently, `:doc` doesn't support rendering clickable links anyway, so we don't loose much by having relative links. --- pkgs/by-name/tr/treefmt/lib.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/tr/treefmt/lib.nix b/pkgs/by-name/tr/treefmt/lib.nix index c5eb56d3c138..a38fb5354bca 100644 --- a/pkgs/by-name/tr/treefmt/lib.nix +++ b/pkgs/by-name/tr/treefmt/lib.nix @@ -15,9 +15,8 @@ # Inputs - : A treefmt module. See [options reference]. - - [options reference]: https://nixos.org/manual/nixpkgs/unstable#sec-treefmt-options-reference + `module` + : A treefmt module. See [options reference](#sec-treefmt-options-reference). */ evalConfig = module: @@ -49,9 +48,8 @@ # Inputs - : A treefmt module. See [options reference]. - - [options reference]: https://nixos.org/manual/nixpkgs/unstable#sec-treefmt-options-reference + `module` + : A treefmt module. See [options reference](#sec-treefmt-options-reference). */ withConfig = module: @@ -75,7 +73,8 @@ # Inputs `settings` - : A settings module, used to build a treefmt config file + : A settings module, used to build a treefmt config file. + See [`settings` option reference](#opt-treefmt-settings). */ buildConfig = module: From efbf556332524db0428afbc91a9bc5fdee77b60a Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Wed, 14 May 2025 22:25:47 +0100 Subject: [PATCH 196/272] treefmt: add longDescription linking to Nixpkgs Manual Link to the treefmt section of the Nixpkgs Manual in the `treefmt` package's long description. Additionally, link to treefmt-nix. --- pkgs/by-name/tr/treefmt/package.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/by-name/tr/treefmt/package.nix b/pkgs/by-name/tr/treefmt/package.nix index ab9c136ac434..0c0151b4a7b7 100644 --- a/pkgs/by-name/tr/treefmt/package.nix +++ b/pkgs/by-name/tr/treefmt/package.nix @@ -46,6 +46,19 @@ buildGoModule rec { meta = { description = "one CLI to format the code tree"; + longDescription = '' + [treefmt](${meta.homepage}) streamlines the process of applying formatters + to your project, making it a breeze with just one command line. + + The `treefmt` package provides functions for configuring treefmt using + the module system, which are documented in the [treefmt section] of the + Nixpkgs Manual. + + Alternatively, treefmt can be configured using [treefmt-nix]. + + [treefmt section]: https://nixos.org/manual/nixpkgs/unstable#treefmt + [treefmt-nix]: https://github.com/numtide/treefmt-nix + ''; homepage = "https://github.com/numtide/treefmt"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ From 3f96c18c79e734f84b5c12fa12467c8aa44e8c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1nchez=20Medina?= Date: Fri, 9 May 2025 19:23:55 +0200 Subject: [PATCH 197/272] docs: add instructions to load development utilities Co-authored-by: Valentin Gagarin --- doc/README.md | 22 ++++++++++++++++++- .../contributing-to-this-manual.chapter.md | 22 +++++++++++++++++++ nixos/doc/manual/redirects.json | 3 +++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/doc/README.md b/doc/README.md index 531c38acdfa5..029db7eabc7f 100644 --- a/doc/README.md +++ b/doc/README.md @@ -34,7 +34,27 @@ $ nix-build doc If the build succeeds, the manual will be in `./result/share/doc/nixpkgs/manual.html`. -### devmode +### Development environment + +In order to reduce repetition, consider using tools from the provided development environment: + +Load it from the Nixpkgs documentation directory with + +```ShellSession +$ cd /path/to/nixpkgs/doc +$ nix-shell +``` + +To load the development utilities automatically when entering that directory, [set up `nix-direnv`](https://nix.dev/guides/recipes/direnv). + +Make sure that your local files aren't added to Git history by adding the following lines to `.git/info/exclude` at the root of the Nixpkgs repository: + +``` +/**/.envrc +/**/.direnv +``` + +#### `devmode` The shell in the manual source directory makes available a command, `devmode`. It is a daemon, that: diff --git a/nixos/doc/manual/contributing-to-this-manual.chapter.md b/nixos/doc/manual/contributing-to-this-manual.chapter.md index 7515bef44b10..a78a136becca 100644 --- a/nixos/doc/manual/contributing-to-this-manual.chapter.md +++ b/nixos/doc/manual/contributing-to-this-manual.chapter.md @@ -17,6 +17,28 @@ There's also [a convenient development daemon](https://nixos.org/manual/nixpkgs/ The above instructions don't deal with the appendix of available `configuration.nix` options, and the manual pages related to NixOS. These are built, and written in a different location and in a different format, as explained in the next sections. +## Development environment {#sec-contributing-development-env} + +In order to reduce repetition, consider using tools from the provided development environment: + +Load it from the NixOS documentation directory with + +```ShellSession +$ cd /path/to/nixpkgs/nixos/doc/manual +$ nix-shell +``` + +To load the development utilities automatically when entering that directory, [set up `nix-direnv`](https://nix.dev/guides/recipes/direnv). + +Make sure that your local files aren't added to Git history by adding the following lines to `.git/info/exclude` at the root of the Nixpkgs repository: + +``` +/**/.envrc +/**/.direnv +``` + +You might want to also use [`devmode`](https://github.com/NixOS/nixpkgs/blob/master/doc/README.md#devmode) while editing the manual. + ## Testing redirects {#sec-contributing-redirects} Once you have a successful build, you can open the relevant HTML (path mentioned above) in a browser along with the anchor, and observe the redirection. diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index d583ddbcd814..d8a07c11a916 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -71,6 +71,9 @@ "ch-installation": [ "index.html#ch-installation" ], + "sec-contributing-development-env": [ + "index.html#sec-contributing-development-env" + ], "sec-mattermost": [ "index.html#sec-mattermost" ], From 03875543f1ff97f2ef1108fc71908a352aff802e Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Tue, 20 May 2025 07:32:09 +0100 Subject: [PATCH 198/272] oama: 0.19.0 -> 0.20.1 (#408872) --- ...ade-cabal-version-for-ghc-9.6-compat.patch | 22 ------------------- pkgs/by-name/oa/oama/generated-package.nix | 6 ++--- pkgs/by-name/oa/oama/package.nix | 4 +--- 3 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 pkgs/by-name/oa/oama/0001-Downgrade-cabal-version-for-ghc-9.6-compat.patch diff --git a/pkgs/by-name/oa/oama/0001-Downgrade-cabal-version-for-ghc-9.6-compat.patch b/pkgs/by-name/oa/oama/0001-Downgrade-cabal-version-for-ghc-9.6-compat.patch deleted file mode 100644 index 1e2a4150f0ab..000000000000 --- a/pkgs/by-name/oa/oama/0001-Downgrade-cabal-version-for-ghc-9.6-compat.patch +++ /dev/null @@ -1,22 +0,0 @@ -From d6d43789bf5af99c9c18f4c88e6a6751bdcacbce Mon Sep 17 00:00:00 2001 -From: Nick Hu -Date: Wed, 16 Apr 2025 15:18:02 +0100 -Subject: [PATCH] Downgrade cabal-version for ghc 9.6 compat - ---- - oama.cabal | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/oama.cabal b/oama.cabal -index 658c051..4d0c428 100644 ---- a/oama.cabal -+++ b/oama.cabal -@@ -1,4 +1,4 @@ --cabal-version: 3.12 -+cabal-version: 3.8 - name: oama - version: 0.19.0 - license: BSD-3-Clause --- -2.48.1 - diff --git a/pkgs/by-name/oa/oama/generated-package.nix b/pkgs/by-name/oa/oama/generated-package.nix index 3385f05bf7a6..e78d118a8e0b 100644 --- a/pkgs/by-name/oa/oama/generated-package.nix +++ b/pkgs/by-name/oa/oama/generated-package.nix @@ -31,11 +31,11 @@ }: mkDerivation { pname = "oama"; - version = "0.19.0"; + version = "0.20.1"; src = fetchgit { url = "https://github.com/pdobsan/oama.git"; - sha256 = "1nrgpnh76fcmkdw1j3ha5cam7bnxkgfns2plj8609qv0v0swmj4s"; - rev = "3eef17b7e290dfced252375a13bc8dd46849adf0"; + sha256 = "sha256-59tKAHL7rCZJyfraD7NnwFR5iP6784IcgH82hfsFHiA="; + rev = "99659a8567808b28885ed241abe4df03f37e92fc"; fetchSubmodules = true; }; isLibrary = true; diff --git a/pkgs/by-name/oa/oama/package.nix b/pkgs/by-name/oa/oama/package.nix index 0e4f99ad3d1e..d68fc20ae775 100644 --- a/pkgs/by-name/oa/oama/package.nix +++ b/pkgs/by-name/oa/oama/package.nix @@ -1,6 +1,5 @@ { haskell, - haskellPackages, lib, stdenv, }: @@ -8,7 +7,6 @@ let inherit (haskell.lib.compose) overrideCabal justStaticExecutables; overrides = { - patches = [ ./0001-Downgrade-cabal-version-for-ghc-9.6-compat.patch ]; description = "OAuth credential MAnager"; homepage = "https://github.com/pdobsan/oama"; maintainers = with lib.maintainers; [ aidalgol ]; @@ -16,7 +14,7 @@ let passthru.updateScript = ./update.sh; }; - raw-pkg = haskellPackages.callPackage ./generated-package.nix { }; + raw-pkg = haskell.packages.ghc912.callPackage ./generated-package.nix { }; in lib.pipe raw-pkg [ (overrideCabal overrides) From d747d7ac39e7a074d732aff3727482772101a6ea Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Tue, 20 May 2025 15:32:24 +0900 Subject: [PATCH 199/272] cloudflare-warp: update meta.homepage - Old URL now returns 404 Not Found - Official documentation was updated in https://github.com/cloudflare/cloudflare-docs/commit/053f89d2b797c67094a025066625794ea189b039 --- pkgs/by-name/cl/cloudflare-warp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix index c3b2ab00ca05..989f0e98cb49 100644 --- a/pkgs/by-name/cl/cloudflare-warp/package.nix +++ b/pkgs/by-name/cl/cloudflare-warp/package.nix @@ -146,7 +146,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Replaces the connection between your device and the Internet with a modern, optimized, protocol"; - homepage = "https://pkg.cloudflareclient.com/packages/cloudflare-warp"; + homepage = "https://pkg.cloudflareclient.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; mainProgram = "warp-cli"; From 572763cd273604bf9086a8dc17b97534c55e8386 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 06:40:16 +0000 Subject: [PATCH 200/272] ctre: 3.9.0 -> 3.10.0 --- pkgs/by-name/ct/ctre/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ct/ctre/package.nix b/pkgs/by-name/ct/ctre/package.nix index f0418ae956e8..14ee2cef419f 100644 --- a/pkgs/by-name/ct/ctre/package.nix +++ b/pkgs/by-name/ct/ctre/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ctre"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "hanickadot"; repo = "compile-time-regular-expressions"; rev = "v${version}"; - hash = "sha256-Fmx8eKo4UHSYQa5RL70VmaogQj+ILVA1gfpaVE8+MlQ="; + hash = "sha256-/44oZi6j8+a1D6ZGZpoy82GHjPtqzOvuS7d3SPbH7fs="; }; nativeBuildInputs = [ cmake ]; From 0c67c3eee0260c95986056bf1d25d12572254cac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 May 2025 08:47:46 +0200 Subject: [PATCH 201/272] goimapnotify: add changelog to meta --- pkgs/by-name/go/goimapnotify/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/go/goimapnotify/package.nix b/pkgs/by-name/go/goimapnotify/package.nix index 4bba2dcd3659..30176e056f3d 100644 --- a/pkgs/by-name/go/goimapnotify/package.nix +++ b/pkgs/by-name/go/goimapnotify/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitLab { owner = "shackra"; repo = "goimapnotify"; - rev = version; + tag = version; hash = "sha256-RHTOieuw4ZeM1hKHUobMIzAKQ2ZgqIaJMoemF6JY8Vg="; }; @@ -27,6 +27,7 @@ buildGoModule rec { meta = with lib; { description = "Execute scripts on IMAP mailbox changes (new/deleted/updated messages) using IDLE"; homepage = "https://gitlab.com/shackra/goimapnotify"; + changelog = "https://gitlab.com/shackra/goimapnotify/-/blob/${src.tag}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ wohanley From c2d203ba50b416c2b6505867b2adbfb070fdcc4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 20 May 2025 08:54:37 +0200 Subject: [PATCH 202/272] k3s: better util-linux patch url The commit is in master so we don't need to point to the pull request --- pkgs/applications/networking/cluster/k3s/builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index e31d6203bc5f..8cbb824230f0 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -339,7 +339,7 @@ let patches = prev.patches or [ ] ++ lib.singleton (fetchpatch { - url = "https://github.com/util-linux/util-linux/pull/3479.patch"; + url = "https://github.com/util-linux/util-linux/commit/7dbfe31a83f45d5aef2b508697e9511c569ffbc8.patch"; hash = "sha256-bJqpZiPli5Pm/XpDA445Ab5jesXrlcnaO6e4V0B3rSw="; }); }); From 36d83e5c62df7def363681a8e6ddf25f8a5982ef Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 20 May 2025 10:21:21 +0300 Subject: [PATCH 203/272] kdePackages.kirigami-addons: 1.7.0 -> 1.8.0 --- pkgs/kde/misc/kirigami-addons/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/kde/misc/kirigami-addons/default.nix b/pkgs/kde/misc/kirigami-addons/default.nix index c9946d1d45e7..7c847683888f 100644 --- a/pkgs/kde/misc/kirigami-addons/default.nix +++ b/pkgs/kde/misc/kirigami-addons/default.nix @@ -4,16 +4,18 @@ fetchurl, qtdeclarative, qt5compat, + qttools, }: mkKdeDerivation rec { pname = "kirigami-addons"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { url = "mirror://kde/stable/kirigami-addons/kirigami-addons-${version}.tar.xz"; - hash = "sha256-fYVJdRhc90DeSG2E8eLsPk6ttmrJ+4lyFMupq4zEkrE="; + hash = "sha256-USAIVeTyhVCfcbHPkjmjRQYx+Aj109CETroBAfW00es="; }; + extraNativeBuildInputs = [ (qttools.override { withClang = true; }) ]; extraBuildInputs = [ qtdeclarative ]; extraPropagatedBuildInputs = [ qt5compat ]; From 501b5b8fe3d5f5ec39fbace761ea9c8ddce43f68 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Tue, 20 May 2025 15:21:51 +0800 Subject: [PATCH 204/272] python3Packages.tree-sitter-language-pack: 0.6.1 -> 0.7.3 --- .../tree-sitter-language-pack/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tree-sitter-language-pack/default.nix b/pkgs/development/python-modules/tree-sitter-language-pack/default.nix index c63bd83f8df0..d1e099c82654 100644 --- a/pkgs/development/python-modules/tree-sitter-language-pack/default.nix +++ b/pkgs/development/python-modules/tree-sitter-language-pack/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "tree-sitter-language-pack"; - version = "0.6.1"; + version = "0.7.3"; pyproject = true; # Using the GitHub sources necessitates fetching the treesitter grammar parsers by using a vendored script: @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tree_sitter_language_pack"; inherit version; - hash = "sha256-pGNfW2ubZCVi2QHk6qJfyClJ1mDIi5R1Pm1GfZY0Ark="; + hash = "sha256-SROctgfYE1LTOtGOV1IPwQV6AJlVyczO1WYHzBjmo/0="; }; build-system = [ @@ -42,6 +42,12 @@ buildPythonPackage rec { tree-sitter-yaml ]; + prePatch = '' + # Remove the packaged bindings, which only work on Linux and prevent the build from succeeding + # https://github.com/Goldziher/tree-sitter-language-pack/issues/46 + rm -rf tree_sitter_language_pack/bindings/*.so + ''; + pythonImportsCheck = [ "tree_sitter_language_pack" "tree_sitter_language_pack.bindings" From 811c58b7bff72cacfdd8e3e613c0adbaad7a85ce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 May 2025 09:25:42 +0200 Subject: [PATCH 205/272] python313Packages.argilla: 2.6.0 -> 2.8.0 Changelog: https://github.com/argilla-io/argilla/releases/tag/v2.8.0 --- .../python-modules/argilla/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index c90adc544109..69ba771631ce 100644 --- a/pkgs/development/python-modules/argilla/default.nix +++ b/pkgs/development/python-modules/argilla/default.nix @@ -9,7 +9,6 @@ buildPythonPackage, cleanlab, datasets, - deprecated, elasticsearch8, evaluate, factory-boy, @@ -28,9 +27,10 @@ packaging, pandas, passlib, - setuptools, + pdm-backend, peft, pgmpy, + pillow, plotly, prodict, psutil, @@ -53,6 +53,7 @@ spacy-transformers, spacy, sqlalchemy, + standardwebhooks, tqdm, transformers, typer, @@ -67,16 +68,16 @@ buildPythonPackage rec { pname = "argilla"; - version = "2.6.0"; + version = "2.8.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "argilla-io"; repo = "argilla"; tag = "v${version}"; - hash = "sha256-2e2AIhrCJoPDn6EnO4IGSd2YNV/iSY39nmzbcHNwtOU="; + hash = "sha256-8j7/Gtn4FnAZA3oIV7dLxKwNtigqB7AweHtQ/kzLwm4="; }; sourceRoot = "${src.name}/${pname}"; @@ -89,21 +90,23 @@ buildPythonPackage rec { "wrapt" ]; - build-system = [ setuptools ]; + build-system = [ pdm-backend ]; dependencies = [ httpx - deprecated + datasets packaging pandas pydantic wrapt numpy tqdm - backoff + pillow + huggingface-hub monotonic rich typer + standardwebhooks ]; optional-dependencies = { @@ -112,6 +115,7 @@ buildPythonPackage rec { aiofiles aiosqlite alembic + backoff brotli-asgi elasticsearch8 fastapi @@ -142,11 +146,9 @@ buildPythonPackage rec { ]; integrations = [ cleanlab - datasets evaluate faiss flyingsquid - huggingface-hub openai peft pgmpy From f5b9047846de12b540809f8f4d742acab0ba57fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 07:38:45 +0000 Subject: [PATCH 206/272] nixos-anywhere: 1.9.0 -> 1.10.0 --- pkgs/by-name/ni/nixos-anywhere/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixos-anywhere/package.nix b/pkgs/by-name/ni/nixos-anywhere/package.nix index 2077e794025b..424813cec2a5 100644 --- a/pkgs/by-name/ni/nixos-anywhere/package.nix +++ b/pkgs/by-name/ni/nixos-anywhere/package.nix @@ -31,12 +31,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nixos-anywhere"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixos-anywhere"; rev = finalAttrs.version; - hash = "sha256-DGJ52K2cN3MRUlI/knH0tipGja0Agfk+QVfIQL1gWT4="; + hash = "sha256-xzalz30m0iTVfxPMf0nROg5j/xvg6NhHsX04+ym1E9w="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' From 10e908f446f4317479fb5458c0b45d342e9b54e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 08:09:09 +0000 Subject: [PATCH 207/272] vsce: 3.3.2 -> 3.4.1 --- pkgs/by-name/vs/vsce/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vs/vsce/package.nix b/pkgs/by-name/vs/vsce/package.nix index 91429d8bd801..b98b8844994a 100644 --- a/pkgs/by-name/vs/vsce/package.nix +++ b/pkgs/by-name/vs/vsce/package.nix @@ -12,16 +12,16 @@ buildNpmPackage (finalAttrs: { pname = "vsce"; - version = "3.3.2"; + version = "3.4.1"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode-vsce"; rev = "v${finalAttrs.version}"; - hash = "sha256-6Rls+t1NkU1bZuT8ZWpKYeGmAdMpNFuYGfdZhtszZQ8="; + hash = "sha256-ufSEKkLqP+D/D5l5teL82RsoVgIFhbyOVjnZfnecsKI="; }; - npmDepsHash = "sha256-HZkzH5flOPiTUvFW/DOi5n034RAvMoU9lRvB6Omdb2M="; + npmDepsHash = "sha256-J7ES/a6RHeTY1grdzgYu9ex7BOzadqng2/h2LlTZLns="; postPatch = '' substituteInPlace package.json --replace-fail '"version": "0.0.0"' '"version": "${finalAttrs.version}"' From 3adf87de37f00c7bccfbf53dc2b9391e1c77da89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 08:13:13 +0000 Subject: [PATCH 208/272] libretro.mame2003-plus: 0-unstable-2025-05-08 -> 0-unstable-2025-05-16 --- .../applications/emulators/libretro/cores/mame2003-plus.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix index 5edde8f89946..e83c9b162354 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mame2003-plus"; - version = "0-unstable-2025-05-08"; + version = "0-unstable-2025-05-16"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2003-plus-libretro"; - rev = "d3e54870080f9389b4b3e6c6f717bfa29a2fd7fe"; - hash = "sha256-k3YLCP9FNBu5rD+T5bM+hJr1XNbUlXm8a96VRcj7PFw="; + rev = "c478eae7484b76aaacc76659dd4d7b8e1163bc87"; + hash = "sha256-l7GwSj7/A/1ZAAqWz1GtMDCl6F45GJqucDBD89yqcsU="; }; makefile = "Makefile"; From 4dbb8207e98f75d661ffbecaf24f10b5d50d92cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 08:37:38 +0000 Subject: [PATCH 209/272] vscode-extensions.fill-labs.dependi: 0.7.14 -> 0.7.15 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c9ef8e132494..37e9c7c208e3 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1841,8 +1841,8 @@ let mktplcRef = { name = "dependi"; publisher = "fill-labs"; - version = "0.7.14"; - hash = "sha256-iLF2kxhSw39JBIs5K6hVmrEKueS8C22rnKCs+CiphwY="; + version = "0.7.15"; + hash = "sha256-BXilurHO9WATC0PhT/scpZWEiRhJ9cSlq59opEM6wlE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/fill-labs.dependi/changelog"; From 1ffcd50db6878076d0cccde5e24e1eb02093a2c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 May 2025 21:07:05 +0000 Subject: [PATCH 210/272] python3Packages.pytest-scim2-server: 0.1.3 -> 0.1.5 --- .../python-modules/pytest-scim2-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-scim2-server/default.nix b/pkgs/development/python-modules/pytest-scim2-server/default.nix index cf591738c47d..f4256b2576ac 100644 --- a/pkgs/development/python-modules/pytest-scim2-server/default.nix +++ b/pkgs/development/python-modules/pytest-scim2-server/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytest-scim2-server"; - version = "0.1.3"; + version = "0.1.5"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pytest_scim2_server"; inherit version; - hash = "sha256-iZrKKUfbqAAhugSNhqiCy6mVBoXxa0yruiQzHg0pIDY="; + hash = "sha256-5jsjVtxiSF3cu9useDEmwQ45PqJAZmfw7OUIZkCi6gQ="; }; build-system = [ hatchling ]; From dd7ad02f76af89a7cac43f09446ec9c390f1092d Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Tue, 20 May 2025 05:04:52 -0400 Subject: [PATCH 211/272] nixos/prowlarr: add configurable dataDir and user/group options (#408902) --- .../services/misc/servarr/prowlarr.nix | 65 +++++++++++++++---- 1 file changed, 52 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/misc/servarr/prowlarr.nix b/nixos/modules/services/misc/servarr/prowlarr.nix index dcf5b18005b4..b8d93bd6e8a4 100644 --- a/nixos/modules/services/misc/servarr/prowlarr.nix +++ b/nixos/modules/services/misc/servarr/prowlarr.nix @@ -13,6 +13,12 @@ in services.prowlarr = { enable = lib.mkEnableOption "Prowlarr, an indexer manager/proxy for Torrent trackers and Usenet indexers"; + dataDir = lib.mkOption { + type = lib.types.str; + default = "/var/lib/prowlarr"; + description = "The directory where Prowlarr stores its data files."; + }; + package = lib.mkPackageOption pkgs "prowlarr" { }; openFirewall = lib.mkOption { @@ -24,30 +30,63 @@ in settings = servarr.mkServarrSettingsOptions "prowlarr" 9696; environmentFiles = servarr.mkServarrEnvironmentFiles "prowlarr"; + + user = lib.mkOption { + type = lib.types.str; + default = "prowlarr"; + description = '' + User account under which Prowlarr runs. + ''; + }; + + group = lib.mkOption { + type = lib.types.str; + default = "prowlarr"; + description = '' + Group under which Prowlarr runs. + ''; + }; }; }; config = lib.mkIf cfg.enable { - systemd.services.prowlarr = { - description = "Prowlarr"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - environment = servarr.mkServarrSettingsEnvVars "PROWLARR" cfg.settings // { - HOME = "/var/empty"; + systemd = { + services.prowlarr = { + description = "Prowlarr"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + environment = servarr.mkServarrSettingsEnvVars "PROWLARR" cfg.settings; + + serviceConfig = { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + EnvironmentFile = cfg.environmentFiles; + ExecStart = "${lib.getExe cfg.package} -nobrowser -data='${cfg.dataDir}'"; + Restart = "on-failure"; + }; }; - serviceConfig = { - Type = "simple"; - DynamicUser = true; - StateDirectory = "prowlarr"; - EnvironmentFile = cfg.environmentFiles; - ExecStart = "${lib.getExe cfg.package} -nobrowser -data=/var/lib/prowlarr"; - Restart = "on-failure"; + tmpfiles.settings."10-prowlarr".${cfg.dataDir}.d = { + inherit (cfg) user group; + mode = "0700"; }; }; networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.settings.server.port ]; }; + + users.users = lib.mkIf (cfg.user == "prowlarr") { + prowlarr = { + isSystemUser = true; + group = cfg.group; + home = cfg.dataDir; + }; + }; + + users.groups = lib.mkIf (cfg.group == "prowlarr") { + prowlarr = { }; + }; }; } From 9307ece25756842fce26792b3160d52c86f47661 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 03:23:15 +0000 Subject: [PATCH 212/272] python3Packages.otpauth: 2.2.0 -> 2.2.1 --- pkgs/development/python-modules/otpauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/otpauth/default.nix b/pkgs/development/python-modules/otpauth/default.nix index 40ac405462ae..e3d43c8e0515 100644 --- a/pkgs/development/python-modules/otpauth/default.nix +++ b/pkgs/development/python-modules/otpauth/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "otpauth"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-Ev2uZNBmT/v6/a39weyP5XGs0OcaYveSM9072giNOcI="; + hash = "sha256-Fpp629cV/KaH9qZtAszb78Ip+0n4pjS5WNKG+QgTTVk="; }; build-system = [ hatchling ]; From 39693262f5b495b28fce7dc7f3e0d805e1ff2c51 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 20 May 2025 11:34:18 +0200 Subject: [PATCH 213/272] 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 214/272] 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 215/272] 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 216/272] 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 217/272] 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 00efca8c0ccf7374ac8f4d6a521f6977e6d0bce1 Mon Sep 17 00:00:00 2001 From: Shogo Takata Date: Tue, 20 May 2025 10:28:31 +0900 Subject: [PATCH 218/272] dockerTools: fix build failure when building in vm Fixes build failure for nixos.tests.docker-tools. The tar command below the changed line relied on the $out directory being created but it is not being created after the commit below. 97ed6b4565e76286062e6942517a71ae4c9cac72 --- pkgs/build-support/docker/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index ca3692029181..09096dfc78a2 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -392,6 +392,7 @@ rec { postMount = '' echo "Packing raw image..." + mkdir -p $out tar -C mnt --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar . ''; From 17d13f6906348c954d540e3a0d73108e59d9aac8 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Tue, 20 May 2025 17:47:48 +0800 Subject: [PATCH 219/272] python3Packages.tree-sitter-language-pack: add check and update script --- .../tree-sitter-language-pack/default.nix | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tree-sitter-language-pack/default.nix b/pkgs/development/python-modules/tree-sitter-language-pack/default.nix index d1e099c82654..2bdfbf2efca4 100644 --- a/pkgs/development/python-modules/tree-sitter-language-pack/default.nix +++ b/pkgs/development/python-modules/tree-sitter-language-pack/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + python, + nix-update-script, # build-system cython, @@ -53,8 +55,30 @@ buildPythonPackage rec { "tree_sitter_language_pack.bindings" ]; - # No tests in the pypi archive - doCheck = false; + # No tests in the pypi archive, we add a test to check that all bindings can be imported + checkPhase = '' + runHook preCheck + + cat < test-import-bindings.py + import sys + import os + if (cwd := os.getcwd()) in sys.path: + # remove current working directory from sys.path, use PYTHONPATH instead + sys.path.remove(cwd) + + from typing import get_args + from tree_sitter_language_pack import SupportedLanguage, get_binding + + for lang in get_args(SupportedLanguage): + get_binding(lang) + EOF + + ${python.interpreter} test-import-bindings.py + + runHook postCheck + ''; + + passthru.updateScript = nix-update-script { }; meta = { description = "Comprehensive collection of tree-sitter languages"; From be3bbc5badde3878bf6cea47147de951432af3c3 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Tue, 20 May 2025 18:25:05 +0800 Subject: [PATCH 220/272] aider-chat: enable ocaml tests --- pkgs/development/python-modules/aider-chat/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/aider-chat/default.nix b/pkgs/development/python-modules/aider-chat/default.nix index 72fe6f9f4a50..4aa6ae731311 100644 --- a/pkgs/development/python-modules/aider-chat/default.nix +++ b/pkgs/development/python-modules/aider-chat/default.nix @@ -285,9 +285,6 @@ let "test_main_exit_calls_version_check" # AssertionError: assert 2 == 1 "test_simple_send_non_retryable_error" - # Broken tests (Aider-AI/aider#3679) - "test_language_ocaml" - "test_language_ocaml_interface" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Tests fails on darwin From 5654ba174d36e8273852deba639de1adec7d3889 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 10:29:23 +0000 Subject: [PATCH 221/272] python3Packages.cloudpathlib: 0.21.0 -> 0.21.1 --- pkgs/development/python-modules/cloudpathlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix index 61a65025bf79..00ec94cf771a 100644 --- a/pkgs/development/python-modules/cloudpathlib/default.nix +++ b/pkgs/development/python-modules/cloudpathlib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "cloudpathlib"; - version = "0.21.0"; + version = "0.21.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "drivendataorg"; repo = "cloudpathlib"; tag = "v${version}"; - hash = "sha256-sChYdXltPPQ5XP7obY5EoMz/dq3fHQ3FqI0w8noEI+4="; + hash = "sha256-Bhr92xMK/WV3u0SG8q9SvO0kGnwSVXHzq6lK/RD2ssk="; }; postPatch = '' From 4612572032f3f37977fe504ac5b86e8769905bec Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 15 May 2025 16:36:01 +0300 Subject: [PATCH 222/272] irccat: 0.4.8 -> 0.4.12 --- pkgs/by-name/ir/irccat/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ir/irccat/package.nix b/pkgs/by-name/ir/irccat/package.nix index e1851f473d18..9e9d3c845470 100644 --- a/pkgs/by-name/ir/irccat/package.nix +++ b/pkgs/by-name/ir/irccat/package.nix @@ -6,22 +6,23 @@ buildGoModule rec { pname = "irccat"; - version = "0.4.8"; + version = "0.4.12"; src = fetchFromGitHub { owner = "irccloud"; repo = "irccat"; rev = "v${version}"; - hash = "sha256-fr5x1usviJPbc4t5SpIVgV9Q6071XG8eYtyeyraddts="; + hash = "sha256-W6Qj+zg6jC304bEIQeFB8unSFgjV60zXV+I8hpw3AFA="; }; - vendorHash = "sha256-IRXyM000ZDiLPHX20lXlx00tkCzBe5PqvdgXAvm0EAw="; + vendorHash = "sha256-SUE868jVJywqE0A5yjMWohrMw58OUnxGGxvcR8UzPfE="; - meta = with lib; { + meta = { homepage = "https://github.com/irccloud/irccat"; + changelog = "https://github.com/irccloud/irccat/releases/tag/v${version}0.4.11"; description = "Send events to IRC channels from scripts and other applications"; mainProgram = "irccat"; - maintainers = with maintainers; [ qyliss ]; - license = licenses.gpl3Only; + maintainers = with lib.maintainers; [ qyliss ]; + license = lib.licenses.gpl3Only; }; } From 8f55ad257761e92f05f42a4dcb10a31847c41c45 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 18 May 2025 22:14:15 -0700 Subject: [PATCH 223/272] llvmPackages_git: 21.0.0-unstable-2025-05-11 -> 21.0.0-unstable-2025-05-18 --- pkgs/development/compilers/llvm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 8800a6408c01..c03f49cf80bc 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -33,9 +33,9 @@ let "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; "20.1.4".officialRelease.sha256 = "sha256-/WomqG2DdnUHwlVsMfpzaK/dhGV3zychfU0wLmihQac="; "21.0.0-git".gitRelease = { - rev = "5b91756c0ca7ef4d75c33c2617bfd0f9719907dc"; - rev-version = "21.0.0-unstable-2025-05-11"; - sha256 = "sha256-5e72pOZO2/hYY7/1Kt0ITtEjJzWwKR58ufCU/9EkdS0="; + rev = "3d0c616ce30cdc3d9c26dda8fdc608a6c85f00a6"; + rev-version = "21.0.0-unstable-2025-05-18"; + sha256 = "sha256-5tfGng/urJNSqlFy5sxIYsR5brtf2ZlL5tssGD6Oef8="; }; } // llvmVersions; From dbac89ecc6f09e58c8cf7ee1596a16245d7c8199 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sun, 4 May 2025 16:11:34 +0200 Subject: [PATCH 224/272] mu: 1.12.9 -> 1.12.11 https://github.com/djcb/mu/releases/tag/v1.12.10 https://github.com/djcb/mu/releases/tag/v1.12.11 --- pkgs/by-name/mu/mu/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/mu/package.nix b/pkgs/by-name/mu/mu/package.nix index 7a3f2266d5ac..26193a8a1246 100644 --- a/pkgs/by-name/mu/mu/package.nix +++ b/pkgs/by-name/mu/mu/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.12.9"; + version = "1.12.11"; outputs = [ "out" @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "djcb"; repo = "mu"; rev = "v${version}"; - hash = "sha256-o6K1xHv6dvzv1oRRiAiSXAqTaC0GcPDQ+ymh5kmH98k="; + hash = "sha256-t4Jv1RX1mMGwiYg9mFrRuO2j54EfaGM3ouOdg8upds8="; }; postPatch = '' From b5bd640a9258b12f09f11e6c7fddf8a85129c265 Mon Sep 17 00:00:00 2001 From: anthony Date: Tue, 20 May 2025 13:10:36 +0200 Subject: [PATCH 225/272] doc: fix nixpkgs-manual not being built under `index.html` (#400816) This fixes the anchor links referencing `index.html` while being in `manual.html`. --- doc/doc-support/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix index 65fb0fb38ed7..023be3a3a116 100644 --- a/doc/doc-support/package.nix +++ b/doc/doc-support/package.nix @@ -16,7 +16,6 @@ roboto, treefmt, }: - stdenvNoCC.mkDerivation ( finalAttrs: let @@ -100,14 +99,14 @@ stdenvNoCC.mkDerivation ( dest="$out/share/doc/nixpkgs" mkdir -p "$(dirname "$dest")" mv out "$dest" - mv "$dest/index.html" "$dest/manual.html" + cp "$dest/index.html" "$dest/manual.html" cp ${roboto.src}/web/Roboto\[ital\,wdth\,wght\].ttf "$dest/Roboto.ttf" cp ${epub} "$dest/nixpkgs-manual.epub" mkdir -p $out/nix-support/ - echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products + echo "doc manual $dest index.html" >> $out/nix-support/hydra-build-products echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products runHook postInstall @@ -126,7 +125,7 @@ stdenvNoCC.mkDerivation ( let devmode' = devmode.override { buildArgs = toString ../.; - open = "/share/doc/nixpkgs/manual.html"; + open = "/share/doc/nixpkgs/index.html"; }; nixos-render-docs-redirects' = writeShellScriptBin "redirects" "${lib.getExe nixos-render-docs-redirects} --file ${toString ../redirects.json} $@"; in From c4381dafbc17a9c8c864dfbc05156e95fccd9831 Mon Sep 17 00:00:00 2001 From: Marcos Benevides Date: Sat, 3 May 2025 22:03:41 -0300 Subject: [PATCH 226/272] 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 dab93e55b7882321aa0fb6b1f368541d426a693f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 11:23:22 +0000 Subject: [PATCH 227/272] wyoming-piper: 1.5.2 -> 1.5.3 --- pkgs/by-name/wy/wyoming-piper/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wy/wyoming-piper/package.nix b/pkgs/by-name/wy/wyoming-piper/package.nix index 37118de9d98b..1a91f7380b32 100644 --- a/pkgs/by-name/wy/wyoming-piper/package.nix +++ b/pkgs/by-name/wy/wyoming-piper/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "wyoming-piper"; - version = "1.5.2"; + version = "1.5.3"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-piper"; tag = "v${version}"; - hash = "sha256-HxLs2NH5muYzVfOtfLlV09BQ3waIfZKBCTiK/Tha6r4="; + hash = "sha256-yPGiOF9RXhW7zjvFMi1UCXLyrWiqhJTvvIAtkYb9kBg="; }; build-system = with python3Packages; [ @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with lib; { - changelog = "https://github.com/rhasspy/wyoming-piper/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/rhasspy/wyoming-piper/blob/${src.tag}/CHANGELOG.md"; description = "Wyoming Server for Piper"; mainProgram = "wyoming-piper"; homepage = "https://github.com/rhasspy/wyoming-piper"; From 816aa29cd6535fd97334b3ef5051d08d07b36044 Mon Sep 17 00:00:00 2001 From: Yaya Date: Sun, 18 May 2025 13:57:21 +0200 Subject: [PATCH 228/272] 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 229/272] 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 230/272] 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 231/272] 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 467486f58b694b469952db696b9f29f190dbce54 Mon Sep 17 00:00:00 2001 From: lheintzmann1 Date: Tue, 20 May 2025 13:33:40 +0200 Subject: [PATCH 232/272] maintainers: add lheintzmann1 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ef738411670b..21dacf0a5fd3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13947,6 +13947,12 @@ github = "LogicalOverflow"; githubId = 5919957; }; + lheintzmann1 = { + email = "lheintzmann1@disroot.org"; + github = "lheintzmann1"; + githubId = 141759313; + name = "Lucas Heintzmann"; + }; lhvwb = { email = "nathaniel.baxter@gmail.com"; github = "nathanielbaxter"; From 33c6d3d15b5affeb6a8c709fa17ded967876a6f7 Mon Sep 17 00:00:00 2001 From: lheintzmann1 Date: Tue, 20 May 2025 13:34:00 +0200 Subject: [PATCH 233/272] vscode-extensions.teros-technology.teroshdl: init at 7.0.3 --- .../editors/vscode/extensions/default.nix | 2 ++ .../teros-technology-teroshdl/default.nix | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/editors/vscode/extensions/teros-technology-teroshdl/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 54c52d8f98a7..ad4462df4cbf 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4824,6 +4824,8 @@ let tekumara.typos-vscode = callPackage ./tekumara.typos-vscode { }; + teros-technology.teroshdl = callPackage ./teros-technology-teroshdl { }; + theangryepicbanana.language-pascal = buildVscodeMarketplaceExtension { mktplcRef = { name = "language-pascal"; diff --git a/pkgs/applications/editors/vscode/extensions/teros-technology-teroshdl/default.nix b/pkgs/applications/editors/vscode/extensions/teros-technology-teroshdl/default.nix new file mode 100644 index 000000000000..16dc4647a67a --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/teros-technology-teroshdl/default.nix @@ -0,0 +1,22 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "teroshdl"; + publisher = "teros-technology"; + version = "7.0.3"; + hash = "sha256-Bt31ia0X4sQQfREq8PPVEGt/oGe/Oob0yQbYkwNRSsk="; + }; + + meta = { + changelog = "https://github.com/TerosTechnology/vscode-terosHDL/releases"; + description = "Visual Studio Code extension for HDL developments (SystemVerilog/Verilog/VHDL)"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=teros-technology.teroshdl"; + homepage = "https://github.com/TerosTechnology/vscode-terosHDL"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ lheintzmann1 ]; + }; +} From 5c380be4d39e4c5b0bfc0593817a3cd526cf5307 Mon Sep 17 00:00:00 2001 From: Jasper Orschulko Date: Tue, 20 May 2025 14:00:52 +0200 Subject: [PATCH 234/272] doctoc: remove dangling symlinks Fixes https://github.com/NixOS/nixpkgs/issues/409046 --- pkgs/by-name/do/doctoc/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/do/doctoc/package.nix b/pkgs/by-name/do/doctoc/package.nix index faded51f4431..1f7bde794ff3 100644 --- a/pkgs/by-name/do/doctoc/package.nix +++ b/pkgs/by-name/do/doctoc/package.nix @@ -18,6 +18,10 @@ buildNpmPackage rec { npmDepsHash = "sha256-TbAnFpiN/v6xjQQznL/B180f0W48HPRqW21cO9XZhYA="; + postInstall = '' + find $out/lib/node_modules -xtype l -delete + ''; + dontNpmBuild = true; passthru.tests = { From cce01b6a2229879bdb72cd5e7e82d91f909c0513 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 12:17:45 +0000 Subject: [PATCH 235/272] firebase-tools: 14.3.0 -> 14.4.0 --- pkgs/by-name/fi/firebase-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index 288d145f9202..b75b27de2dc4 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "14.3.0"; + version = "14.4.0"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; tag = "v${version}"; - hash = "sha256-Y3+Nw6+ZCnHOJeoMRhWafBVi0yrb41NX/4FcpqHk4eA="; + hash = "sha256-mcb0rCI7tJE6A/CK4rGUJ2qqvjrld0Yzl9l4mMipCoA="; }; - npmDepsHash = "sha256-+rAwYopIP/NEb602TVuZEZUY+dQPzkuTXpWCBeLCjmg="; + npmDepsHash = "sha256-Ezjn5oVjvVJnfw0oBTxNbmfmgHYBDixdiIJHft9FbQE="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json From 9326c68cc52eebb6eed1a201842a1a2b85b36b4d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 12:58:10 +0000 Subject: [PATCH 236/272] prefect: 3.4.0 -> 3.4.2 --- pkgs/by-name/pr/prefect/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prefect/package.nix b/pkgs/by-name/pr/prefect/package.nix index 5378da18d94c..7d566da9aea9 100644 --- a/pkgs/by-name/pr/prefect/package.nix +++ b/pkgs/by-name/pr/prefect/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "prefect"; - version = "3.4.0"; + version = "3.4.2"; pyproject = true; # Trying to install from source is challenging @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { # Source will be missing sdist, uv.lock, ui artefacts ... src = fetchPypi { inherit pname version; - hash = "sha256-uguh6sOIy0mOASFsw8ADb8vpmQm7S+t4ZS/6MFFYiic="; + hash = "sha256-BORFXIikiX5Cu1rT8jUijkjAnncTACr8lEs/k2fC5Mk="; }; pythonRelaxDeps = [ From da0eb64446ebcd03c38008e4511c4dcd78f7e6d0 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Tue, 20 May 2025 16:00:12 +0300 Subject: [PATCH 237/272] hyprlandPlugins/hyprland-plugins: 0.49.0 -> 0.49.0-fix --- .../hyprwm/hyprland-plugins/hyprland-plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix index 09d0f12903a8..8884bd4eb130 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix @@ -14,13 +14,13 @@ let mkHyprlandPlugin, }: let - version = "0.49.0"; + version = "0.49.0-fix"; hyprland-plugins-src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland-plugins"; tag = "v${version}"; - hash = "sha256-GpsLyK/U05q7QnyFIWrnGS2loVyjPZByTtPitwu9UNw="; + hash = "sha256-5wjvmFtk85uBJLnrKZbfrgo9OTTQlFP18ZNgfBwFsz0="; }; in mkHyprlandPlugin hyprland { From ced8a6aef6f2cab09a8d7650d4ee333114d11bcb Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 20 May 2025 14:05:23 +0100 Subject: [PATCH 238/272] libfpx: drop Unused, unmaintained image processing library stuck on an outdated version from 2016 and untouched outside of treewides/ZHF since that bump. Per , this version has known vulnerabilities. The source tarball has also vanished from all of the mirrors. --- pkgs/by-name/li/libfpx/package.nix | 47 ------------------------------ pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 pkgs/by-name/li/libfpx/package.nix diff --git a/pkgs/by-name/li/libfpx/package.nix b/pkgs/by-name/li/libfpx/package.nix deleted file mode 100644 index 08851aa47759..000000000000 --- a/pkgs/by-name/li/libfpx/package.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - fetchpatch, -}: - -stdenv.mkDerivation rec { - pname = "libfpx"; - version = "1.3.1-7"; - - src = fetchurl { - url = "mirror://imagemagick/delegates/${pname}-${version}.tar.xz"; - sha256 = "1s28mwb06w6dj0zl6ashpj8m1qiyadawzl7cvbw7dmj1w39ipghh"; - }; - - # Darwin gets misdetected as Windows without this - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D__unix"; - - patches = [ - (fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch?id=f28a947813dbc0a1fd1a8d4a712d58a64c48ca01"; - sha256 = "032y8110zgnkdhkdq3745zk53am1x34d912rai8q70k3sskyq22p"; - }) - # Pull upstream fix for -fno-common: - # https://github.com/ImageMagick/libfpx/pull/1 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/ImageMagick/libfpx/commit/c32b340581ba6c88c5092f374f655c7579b598a6.patch"; - sha256 = "1gbc0qb2ri1mj9r66wx0yn28fsr7zhhlyz2mwbica8wh34xijgz9"; - }) - # fix clang build: remove register keyword - # remove on next update - (fetchpatch { - name = "remove-register-keyword.patch"; - url = "https://github.com/ImageMagick/libfpx/commit/5f340b0a490450b40302cc9948c7dfac60d40041.patch"; - hash = "sha256-6m9MFb1eWGK5cMvPmTu7uh3Pac65r2HPB8wJ8xc1O5o="; - }) - ]; - - meta = with lib; { - homepage = "http://www.imagemagick.org"; - description = "Library for manipulating FlashPIX images"; - license = "Flashpix"; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d767c8eb2842..f81e70d39f25 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -991,6 +991,7 @@ mapAliases { libbitcoin-protocol = throw "libbitcoin-protocol has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24 libchop = throw "libchop has been removed due to failing to build and being unmaintained upstream"; # Added 2025-05-02 libdwg = throw "libdwg has been removed as upstream is unmaintained, the code doesn't build without significant patches, and the package had no reverse dependencies"; # Added 2024-12-28 + libfpx = throw "libfpx has been removed as it was unmaintained in Nixpkgs and had known vulnerabilities"; # Added 2025-05-20 libgadu = throw "'libgadu' has been removed as upstream is unmaintained and has no dependents or maintainers in Nixpkgs"; # Added 2025-05-17 libgcrypt_1_8 = throw "'libgcrypt_1_8' is end-of-life. Consider using 'libgcrypt' instead"; # Added 2025-01-05 libgda = lib.warnOnInstantiate "‘libgda’ has been renamed to ‘libgda5’" libgda5; # Added 2025-01-21 From ea62a61c3df87773450dbd7051e2e646780824bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 13:46:25 +0000 Subject: [PATCH 239/272] keepassxc-go: 1.5.1 -> 1.6.0 --- pkgs/by-name/ke/keepassxc-go/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ke/keepassxc-go/package.nix b/pkgs/by-name/ke/keepassxc-go/package.nix index 1e6cf584d6d2..fac1d231a96e 100644 --- a/pkgs/by-name/ke/keepassxc-go/package.nix +++ b/pkgs/by-name/ke/keepassxc-go/package.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "keepassxc-go"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "MarkusFreitag"; repo = "keepassxc-go"; rev = "v${version}"; - hash = "sha256-seCeHNEj5GxAI7BVMPzh+YuoxivmTwvhVCqY5LKHpQk="; + hash = "sha256-Z4SbPxhs+umsUlby7idxofCjP+uLPvp/2oUCpnAS2/A="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-jscyNyVr+RDN1EaxIOc3aYCAVT+1eO/c+dxEsIorDIs="; + vendorHash = "sha256-+cgf2FxpbLu+Yuhk6T0ZBnDH7We2DVu65xFaruk9I0E="; checkFlags = [ # Test tries to monkey-patch the stdlib, fails with permission denied error. From 17d9682f6dfee5e5a9d560903a8264c626976811 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 11 May 2025 15:43:56 +0900 Subject: [PATCH 240/272] 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 241/272] 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 242/272] 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 b54dae9d78e49d94d4ab1419c83bc23a038995b1 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Tue, 20 May 2025 16:30:46 +0200 Subject: [PATCH 243/272] proton-ge-bin: GE-Proton10-2 -> GE-Proton10-3 --- pkgs/by-name/pr/proton-ge-bin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 21b76e2eb4cc..2dd27d631dcc 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton10-2"; + version = "GE-Proton10-3"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-fCxiwATohvdpfxXkHY1ty5WHS0phARrDszGmwNRmVQE="; + hash = "sha256-V4znOni53KMZ0rs7O7TuBst5kDSaEOyWUGgL7EESVAU="; }; dontUnpack = true; From 0742d7dae9403fbda29f4544ca4ad411e6494d3a Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Tue, 20 May 2025 16:33:35 +0200 Subject: [PATCH 244/272] proton-ge-bin: add myself as maintainer --- pkgs/by-name/pr/proton-ge-bin/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 2dd27d631dcc..3a24fa2ae7dd 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -70,6 +70,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/GloriousEggroll/proton-ge-custom"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ + Gliczy NotAShelf Scrumplex shawn8901 From 6ec497cb47435e6b265c56d1988ea43ceb4a01b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 14:41:59 +0000 Subject: [PATCH 245/272] 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 92915181c8ef90a6f8e756745a52e23e7c7664f3 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Tue, 20 May 2025 10:59:17 -0400 Subject: [PATCH 246/272] nixpkgs-review: 3.2.0 -> 3.3.0 Changelog: https://github.com/Mic92/nixpkgs-review/releases/tag/3.3.0 Signed-off-by: Ihar Hrachyshka --- pkgs/by-name/ni/nixpkgs-review/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix index 4627def80b68..fe7f6de6c107 100644 --- a/pkgs/by-name/ni/nixpkgs-review/package.nix +++ b/pkgs/by-name/ni/nixpkgs-review/package.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "3.2.0"; + version = "3.3.0"; pyproject = true; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; tag = version; - hash = "sha256-XJRZpAiIbwN5itqxHTcAqd6VnuUOO8TwShZiupJc8dc="; + hash = "sha256-Ey07yahJQv5ppf8TiwIt1Cn4xo4QMZ5v+CsJRDelWNY="; }; build-system = [ From aff07986dd0a67495e2ae8c657629e56f1ea7d4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 15:07:34 +0000 Subject: [PATCH 247/272] remnote: 1.19.24 -> 1.19.35 --- pkgs/by-name/re/remnote/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index 90686ae038e4..e3576832234d 100644 --- a/pkgs/by-name/re/remnote/package.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.19.24"; + version = "1.19.35"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-+ZNQ94itLdSuw7HS3cLPgJNqVcQ1OfPHF68hFwHpaDQ="; + hash = "sha256-UrldNDYof3lYDyP6z3ukFdpiOkJZUJpO8iygI3JaBY4="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in 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 248/272] 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 ef731c922504cbeac20557ce3f48a3f88313bf65 Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Tue, 20 May 2025 17:26:37 +0200 Subject: [PATCH 249/272] catppuccin: update element includes accent support now --- pkgs/by-name/ca/catppuccin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/catppuccin/package.nix b/pkgs/by-name/ca/catppuccin/package.nix index 32914fe6da4b..dbd858137473 100644 --- a/pkgs/by-name/ca/catppuccin/package.nix +++ b/pkgs/by-name/ca/catppuccin/package.nix @@ -92,8 +92,8 @@ let name = "element"; owner = "catppuccin"; repo = "element"; - rev = "ddced941a2014107918484263b63e030889777fe"; - hash = "sha256-8EP/IQW3rdtomHBfnQNIjGbiD6OapPzXPFLjziNDcmc="; + rev = "70b7ee121dcef28c6c8191d60df2f88b23c89084"; + hash = "sha256-iUSPlmEvwL9akbPobkbDWPr6TTHA/LdCK2Nty7Zslls="; }; grub = fetchFromGitHub { @@ -254,7 +254,7 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO '' + lib.optionalString (lib.elem "element" themeList) '' mkdir -p "$out/element" - cp -r "${sources.element}/themes/Catppuccin-${variant}.json" "$out/element/" + cp -r "${sources.element}/themes/${variant}/${accent}.json" "$out/element/" '' + lib.optionalString (lib.elem "grub" themeList) '' From 00c563c439dd57e1d6effccb7f4557b9ff5dc9ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 15:32:35 +0000 Subject: [PATCH 250/272] lug-helper: 3.8 -> 3.9 --- pkgs/by-name/lu/lug-helper/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lug-helper/package.nix b/pkgs/by-name/lu/lug-helper/package.nix index 047410317329..92ca76d081d6 100644 --- a/pkgs/by-name/lu/lug-helper/package.nix +++ b/pkgs/by-name/lu/lug-helper/package.nix @@ -15,12 +15,12 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { name = "lug-helper"; - version = "3.8"; + version = "3.9"; src = fetchFromGitHub { owner = "starcitizen-lug"; repo = "lug-helper"; tag = "v${finalAttrs.version}"; - hash = "sha256-e0pq3E9Jsx9pBRhN0gFJxZPDUbK/Xe84+5AO2/RlsLo="; + hash = "sha256-Fne0esV/1o+f4Fnn8oeUL+gc29d0ndGpYG21YQvZDvM="; }; buildInputs = [ From 645719c0b32b33c5d17736ffdc97c7c626f79eee Mon Sep 17 00:00:00 2001 From: LucasFA <23667494+LucasFA@users.noreply.github.com> Date: Tue, 20 May 2025 15:47:18 +0100 Subject: [PATCH 251/272] qc71_laptop: rectify meta.platforms This package is not expected to build in other platforms and has been failing aarch64-linux in Hydra for years: https://hydra.nixos.org/eval/1790516?filter=qc71&compare=1790473 https://hydra.nixos.org/eval/1795290?filter=qc71&compare=1795271 https://hydra.nixos.org/eval/1807986?filter=qc71&compare=1807946 --- pkgs/os-specific/linux/qc71_laptop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/qc71_laptop/default.nix b/pkgs/os-specific/linux/qc71_laptop/default.nix index 73a6a77dbad9..2705375237ce 100644 --- a/pkgs/os-specific/linux/qc71_laptop/default.nix +++ b/pkgs/os-specific/linux/qc71_laptop/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/pobrn/qc71_laptop/"; license = licenses.gpl2Only; maintainers = with maintainers; [ aacebedo ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } From a68ae13138cd460389ffe80461843d60ae5b500d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 15:41:23 +0000 Subject: [PATCH 252/272] 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 f26dd733675b8d376abaedca3f4de90cf0d55af6 Mon Sep 17 00:00:00 2001 From: commiterate <111539270+commiterate@users.noreply.github.com> Date: Tue, 20 May 2025 11:48:43 -0400 Subject: [PATCH 253/272] gitlab-runner: Make Bash a runtime dependency to fix clear-docker-cache. --- pkgs/by-name/gi/gitlab-runner/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix index 978f0a0a6f77..9a78beeaf392 100644 --- a/pkgs/by-name/gi/gitlab-runner/package.nix +++ b/pkgs/by-name/gi/gitlab-runner/package.nix @@ -22,7 +22,7 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-wxFVDkqiqs7jaZEPGyawWfs6h6UgAhCWSckM90G44lA="; # For patchShebangs - nativeBuildInputs = [ bash ]; + buildInputs = [ bash ]; patches = [ ./fix-shell-path.patch From 8b03b63301ca4df73704e19645e0a58c90b0bb12 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 20 May 2025 16:08:20 +0100 Subject: [PATCH 254/272] vmtools.diskImageFuns: drop EOL distributions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These went back as far as 2011, and none of them are in active security support. We shouldn’t ship them without a warning and I doubt anyone is using them with a recent Nixpkgs. --- pkgs/build-support/vm/default.nix | 290 +----------------------------- 1 file changed, 1 insertion(+), 289 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 95923cace296..fe2e42855e0e 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -984,277 +984,11 @@ rec { # The set of supported RPM-based distributions. - rpmDistros = { - - # Note: no i386 release for Fedora >= 26 - fedora26x86_64 = - let - version = "26"; - in - { - name = "fedora-${version}-x86_64"; - fullName = "Fedora ${version} (x86_64)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/${version}/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "880055a50c05b20641530d09b23f64501a000b2f92fe252417c530178730a95e"; - }; - urlPrefix = "mirror://fedora/linux/releases/${version}/Everything/x86_64/os"; - archs = [ - "noarch" - "x86_64" - ]; - packages = commonFedoraPackages ++ [ - "cronie" - "util-linux" - ]; - unifiedSystemDir = true; - }; - - fedora27x86_64 = - let - version = "27"; - in - { - name = "fedora-${version}-x86_64"; - fullName = "Fedora ${version} (x86_64)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/${version}/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "48986ce4583cd09825c6d437150314446f0f49fa1a1bd62dcfa1085295030fe9"; - }; - urlPrefix = "mirror://fedora/linux/releases/${version}/Everything/x86_64/os"; - archs = [ - "noarch" - "x86_64" - ]; - packages = commonFedoraPackages ++ [ - "cronie" - "util-linux" - ]; - unifiedSystemDir = true; - }; - - centos6i386 = - let - version = "6.9"; - in - rec { - name = "centos-${version}-i386"; - fullName = "CentOS ${version} (i386)"; - urlPrefix = "mirror://centos/${version}/os/i386"; - packagesList = fetchurl rec { - url = "${urlPrefix}/repodata/${sha256}-primary.xml.gz"; - sha256 = "b826a45082ef68340325c0855f3d2e5d5a4d0f77d28ba3b871791d6f14a97aeb"; - }; - archs = [ - "noarch" - "i386" - ]; - packages = commonCentOSPackages ++ [ "procps" ]; - }; - - centos6x86_64 = - let - version = "6.9"; - in - rec { - name = "centos-${version}-x86_64"; - fullName = "CentOS ${version} (x86_64)"; - urlPrefix = "mirror://centos/${version}/os/x86_64"; - packagesList = fetchurl rec { - url = "${urlPrefix}/repodata/${sha256}-primary.xml.gz"; - sha256 = "ed2b2d4ac98d774d4cd3e91467e1532f7e8b0275cfc91a0d214b532dcaf1e979"; - }; - archs = [ - "noarch" - "x86_64" - ]; - packages = commonCentOSPackages ++ [ "procps" ]; - }; - - # Note: no i386 release for 7.x - centos7x86_64 = - let - version = "7.4.1708"; - in - rec { - name = "centos-${version}-x86_64"; - fullName = "CentOS ${version} (x86_64)"; - urlPrefix = "mirror://centos/${version}/os/x86_64"; - packagesList = fetchurl rec { - url = "${urlPrefix}/repodata/${sha256}-primary.xml.gz"; - sha256 = "b686d3a0f337323e656d9387b9a76ce6808b26255fc3a138b1a87d3b1cb95ed5"; - }; - archs = [ - "noarch" - "x86_64" - ]; - packages = commonCentOSPackages ++ [ "procps-ng" ]; - }; - }; + rpmDistros = { }; # The set of supported Dpkg-based distributions. debDistros = { - ubuntu1404i386 = { - name = "ubuntu-14.04-trusty-i386"; - fullName = "Ubuntu 14.04 Trusty (i386)"; - packagesLists = [ - (fetchurl { - url = "mirror://ubuntu/dists/trusty/main/binary-i386/Packages.bz2"; - sha256 = "1d5y3v3v079gdq45hc07ja0bjlmzqfwdwwlq0brwxi8m75k3iz7x"; - }) - (fetchurl { - url = "mirror://ubuntu/dists/trusty/universe/binary-i386/Packages.bz2"; - sha256 = "03x9w92by320rfklrqhcl3qpwmnxds9c8ijl5zhcb21d6dcz5z1a"; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ - "diffutils" - "libc-bin" - ]; - }; - - ubuntu1404x86_64 = { - name = "ubuntu-14.04-trusty-amd64"; - fullName = "Ubuntu 14.04 Trusty (amd64)"; - packagesLists = [ - (fetchurl { - url = "mirror://ubuntu/dists/trusty/main/binary-amd64/Packages.bz2"; - sha256 = "1hhzbyqfr5i0swahwnl5gfp5l9p9hspywb1vpihr3b74p1z935bh"; - }) - (fetchurl { - url = "mirror://ubuntu/dists/trusty/universe/binary-amd64/Packages.bz2"; - sha256 = "04560ba8s4z4v5iawknagrkn9q1nzvpn081ycmqvhh73p3p3g1jm"; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ - "diffutils" - "libc-bin" - ]; - }; - - ubuntu1604i386 = { - name = "ubuntu-16.04-xenial-i386"; - fullName = "Ubuntu 16.04 Xenial (i386)"; - packagesLists = [ - (fetchurl { - url = "mirror://ubuntu/dists/xenial/main/binary-i386/Packages.xz"; - sha256 = "13r75sp4slqy8w32y5dnr7pp7p3cfvavyr1g7gwnlkyrq4zx4ahy"; - }) - (fetchurl { - url = "mirror://ubuntu/dists/xenial/universe/binary-i386/Packages.xz"; - sha256 = "14fid1rqm3sc0wlygcvn0yx5aljf51c2jpd4x0zxij4019316hsh"; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ - "diffutils" - "libc-bin" - ]; - }; - - ubuntu1604x86_64 = { - name = "ubuntu-16.04-xenial-amd64"; - fullName = "Ubuntu 16.04 Xenial (amd64)"; - packagesLists = [ - (fetchurl { - url = "mirror://ubuntu/dists/xenial/main/binary-amd64/Packages.xz"; - sha256 = "110qnkhjkkwm316fbig3aivm2595ydz6zskc4ld5cr8ngcrqm1bn"; - }) - (fetchurl { - url = "mirror://ubuntu/dists/xenial/universe/binary-amd64/Packages.xz"; - sha256 = "0mm7gj491yi6q4v0n4qkbsm94s59bvqir6fk60j73w7y4la8rg68"; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ - "diffutils" - "libc-bin" - ]; - }; - - ubuntu1804i386 = { - name = "ubuntu-18.04-bionic-i386"; - fullName = "Ubuntu 18.04 Bionic (i386)"; - packagesLists = [ - (fetchurl { - url = "mirror://ubuntu/dists/bionic/main/binary-i386/Packages.xz"; - sha256 = "0f0v4131kwf7m7f8j3288rlqdxk1k3vqy74b7fcfd6jz9j8d840i"; - }) - (fetchurl { - url = "mirror://ubuntu/dists/bionic/universe/binary-i386/Packages.xz"; - sha256 = "1v75c0dqr0wp0dqd4hnci92qqs4hll8frqdbpswadgxm5chn91bw"; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ - "diffutils" - "libc-bin" - ]; - }; - - ubuntu1804x86_64 = { - name = "ubuntu-18.04-bionic-amd64"; - fullName = "Ubuntu 18.04 Bionic (amd64)"; - packagesLists = [ - (fetchurl { - url = "mirror://ubuntu/dists/bionic/main/binary-amd64/Packages.xz"; - sha256 = "1ls81bjyvmfz6i919kszl7xks1ibrh1xqhsk6698ackndkm0wp39"; - }) - (fetchurl { - url = "mirror://ubuntu/dists/bionic/universe/binary-amd64/Packages.xz"; - sha256 = "1832nqpn4ap95b3sj870xqayrza9in4kih9jkmjax27pq6x15v1r"; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ - "diffutils" - "libc-bin" - ]; - }; - - ubuntu2004i386 = { - name = "ubuntu-20.04-focal-i386"; - fullName = "Ubuntu 20.04 Focal (i386)"; - packagesLists = [ - (fetchurl { - url = "mirror://ubuntu/dists/focal/main/binary-i386/Packages.xz"; - sha256 = "sha256-7RAYURoN3RKYQAHpwBS9TIV6vCmpURpphyMJQmV4wLc="; - }) - (fetchurl { - url = "mirror://ubuntu/dists/focal/universe/binary-i386/Packages.xz"; - sha256 = "sha256-oA551xVE80volUPgkMyvzpQ1d+GhuZd4DAe7dXZnULM="; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ - "diffutils" - "libc-bin" - ]; - }; - - ubuntu2004x86_64 = { - name = "ubuntu-20.04-focal-amd64"; - fullName = "Ubuntu 20.04 Focal (amd64)"; - packagesLists = [ - (fetchurl { - url = "mirror://ubuntu/dists/focal/main/binary-amd64/Packages.xz"; - sha256 = "sha256-d1eSH/j+7Zw5NKDJk21EG6SiOL7j6myMHfXLzUP8mGE="; - }) - (fetchurl { - url = "mirror://ubuntu/dists/focal/universe/binary-amd64/Packages.xz"; - sha256 = "sha256-RqdG2seJvZU3rKVNsWgLnf9RwkgVMRE1A4IZnX2WudE="; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ - "diffutils" - "libc-bin" - ]; - }; - ubuntu2204i386 = { name = "ubuntu-22.04-jammy-i386"; fullName = "Ubuntu 22.04 Jammy (i386)"; @@ -1315,28 +1049,6 @@ rec { ]; }; - debian10i386 = { - name = "debian-10.13-buster-i386"; - fullName = "Debian 10.13 Buster (i386)"; - packagesList = fetchurl { - url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/buster/main/binary-i386/Packages.xz"; - hash = "sha256-n9JquhtZgxw3qr9BX0MQoY3ZTIHN0dit+iru3DC31UY="; - }; - urlPrefix = "https://snapshot.debian.org/archive/debian/20221126T084953Z"; - packages = commonDebianPackages; - }; - - debian10x86_64 = { - name = "debian-10.13-buster-amd64"; - fullName = "Debian 10.13 Buster (amd64)"; - packagesList = fetchurl { - url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/buster/main/binary-amd64/Packages.xz"; - hash = "sha256-YukIIB3u87jgp9oudwklsxyKVKjSL618wFgDSXiFmjU="; - }; - urlPrefix = "https://snapshot.debian.org/archive/debian/20221126T084953Z"; - packages = commonDebianPackages; - }; - debian11i386 = { name = "debian-11.8-bullseye-i386"; fullName = "Debian 11.8 Bullseye (i386)"; From 76cb1a68cd9d3c455990809b2685de745e8f0ef5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 15:56:23 +0000 Subject: [PATCH 255/272] python3Packages.aiontfy: 0.5.1 -> 0.5.3 --- pkgs/development/python-modules/aiontfy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiontfy/default.nix b/pkgs/development/python-modules/aiontfy/default.nix index f369add3574b..625522b20319 100644 --- a/pkgs/development/python-modules/aiontfy/default.nix +++ b/pkgs/development/python-modules/aiontfy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "aiontfy"; - version = "0.5.1"; + version = "0.5.3"; pyproject = true; src = fetchFromGitHub { owner = "tr4nt0r"; repo = "aiontfy"; tag = "v${version}"; - hash = "sha256-WQb6sNjpQVgh+9vH7EyrmJHCWL0Mcmw4hHPHa8KsLYc="; + hash = "sha256-xDcx0darzaTRNdtsNTK7rdO5W22Tpt13ZPDOSmO8M8M="; }; build-system = [ From 9da5a909a08fa0b1cecfa37282554ea103a817dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 20 May 2025 18:05:55 +0200 Subject: [PATCH 256/272] qlog: remove myself as maintainer --- pkgs/by-name/ql/qlog/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ql/qlog/package.nix b/pkgs/by-name/ql/qlog/package.nix index 9a6121bdb15f..dfedb53dfe7e 100644 --- a/pkgs/by-name/ql/qlog/package.nix +++ b/pkgs/by-name/ql/qlog/package.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/foldynl/QLog"; maintainers = with lib.maintainers; [ oliver-koss - mkg20001 ]; platforms = with lib.platforms; unix; }; From cc423552dbf732f9386b3fdf0bdcbc9469bb5a19 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 20 May 2025 18:16:03 +0200 Subject: [PATCH 257/272] playwright: fix hashes --- pkgs/development/web/playwright/chromium.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/playwright/chromium.nix b/pkgs/development/web/playwright/chromium.nix index ffc93fc2a18c..7561b985f344 100644 --- a/pkgs/development/web/playwright/chromium.nix +++ b/pkgs/development/web/playwright/chromium.nix @@ -41,8 +41,8 @@ let url = "https://playwright.azureedge.net/builds/chromium/${revision}/chromium-${suffix}.zip"; hash = { - x86_64-linux = "sha256-9bK8HOGoQY5kYYfJypYHeuAoVlXIh/1tv1IsXPpUTpA="; - aarch64-linux = "sha256-KL6tYnPDszXjCHiSNOPHLtz839JPljSOoP7biQfTTAI="; + x86_64-linux = "sha256-7oQQCAIt1VJiMNFEJO40K8oENK/L0BICXm2D/3fZ8bA="; + aarch64-linux = "sha256-1OmByLX2jNHXAzWdXF8Od7S7pj/jl4wwvOQcsZc5R7o="; } .${system} or throwSystem; }; From 7dad80a62649ac5c9b470dc822db7f1a8a93fabc Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 20 May 2025 18:31:35 +0200 Subject: [PATCH 258/272] 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 259/272] 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 80e8649420083c9f35b888f11af931d322e1dd37 Mon Sep 17 00:00:00 2001 From: Adam Perkowski Date: Tue, 20 May 2025 19:00:53 +0200 Subject: [PATCH 260/272] julec: 0.1.3 -> 0.1.5 Co-authored-by: Sebaguardian Co-authored-by: mertcandav Signed-off-by: Adam Perkowski --- pkgs/by-name/ju/julec/package.nix | 38 +++++++++++++++++-------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/ju/julec/package.nix b/pkgs/by-name/ju/julec/package.nix index abc2c8aa05c2..598e616c7649 100644 --- a/pkgs/by-name/ju/julec/package.nix +++ b/pkgs/by-name/ju/julec/package.nix @@ -1,43 +1,43 @@ { lib, - stdenv, + clangStdenv, fetchFromGitHub, }: let irFile = - if stdenv.hostPlatform.system == "x86_64-linux" then + if clangStdenv.hostPlatform.system == "x86_64-linux" then "linux-amd64.cpp" - else if stdenv.hostPlatform.system == "aarch64-linux" then + else if clangStdenv.hostPlatform.system == "aarch64-linux" then "linux-arm64.cpp" - else if stdenv.hostPlatform.system == "i686-linux" then + else if clangStdenv.hostPlatform.system == "i686-linux" then "linux-i386.cpp" - else if stdenv.hostPlatform.system == "x86_64-darwin" then + else if clangStdenv.hostPlatform.system == "x86_64-darwin" then "darwin-amd64.cpp" - else if stdenv.hostPlatform.system == "aarch64-darwin" then + else if clangStdenv.hostPlatform.system == "aarch64-darwin" then "darwin-arm64.cpp" else - throw "Unsupported platform: ${stdenv.hostPlatform.system}"; + throw "Unsupported platform: ${clangStdenv.hostPlatform.system}"; in -stdenv.mkDerivation (finalAttrs: { +clangStdenv.mkDerivation (finalAttrs: { pname = "julec"; - version = "0.1.3"; + version = "0.1.5"; src = fetchFromGitHub { owner = "julelang"; repo = "jule"; tag = "jule${finalAttrs.version}"; name = "jule-${finalAttrs.version}"; - hash = "sha256-hFWoGeTmfXIPcICWXa5W36QDOk3yB7faORxFaM9shcQ="; + hash = "sha256-gFlca9XdRNv2CI3jfMiWejcmGGzabP0VGs4vlvFs72o="; }; irSrc = fetchFromGitHub { owner = "julelang"; repo = "julec-ir"; # revision determined by the upstream commit hash in julec-ir/README.md - rev = "a274782922e4275c4a036d63acffd3369dbc382f"; + rev = "4a3bf4fc84b53aa607855df6635d95d3e310f7ad"; name = "jule-ir-${finalAttrs.version}"; - hash = "sha256-TXMSXTGTzZntPUhT6QTmn3nD2k855ZoAW9aQWyhrE8s="; + hash = "sha256-Wl5AYRGYcQpj/R9nynxNC5r1HK1EmImwkLokdZfp9sE="; }; dontConfigure = true; @@ -58,16 +58,20 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - echo "Building ${finalAttrs.meta.mainProgram} v${finalAttrs.version} for ${stdenv.hostPlatform.system}..." + echo "Building ${finalAttrs.meta.mainProgram}-bootstrap v${finalAttrs.version} for ${clangStdenv.hostPlatform.system}..." mkdir -p bin - ${stdenv.cc.targetPrefix}c++ ir.cpp \ + ${clangStdenv.cc.targetPrefix}c++ ir.cpp \ --std=c++17 \ -Wno-everything \ - -O3 \ - -flto \ + -fwrapv \ + -ffloat-store \ -DNDEBUG \ -fomit-frame-pointer \ - -o "bin/${finalAttrs.meta.mainProgram}" + -fno-strict-aliasing \ + -o "bin/${finalAttrs.meta.mainProgram}-bootstrap" + + echo "Building ${finalAttrs.meta.mainProgram} v${finalAttrs.version} for ${clangStdenv.hostPlatform.system}..." + bin/${finalAttrs.meta.mainProgram}-bootstrap --opt L2 -p -o "bin/${finalAttrs.meta.mainProgram}" "src/${finalAttrs.meta.mainProgram}" runHook postBuild ''; From 890d1a5e6fe6cdb848f8c5734bd5a9b590530406 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 20 May 2025 18:57:18 +0200 Subject: [PATCH 261/272] 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 262/272] 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 263/272] =?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 264/272] 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 265/272] 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 266/272] =?UTF-8?q?h2o:=202.3.0.20250430=20=E2=86=92=202.3?= =?UTF-8?q?.0.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 267/272] 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 268/272] 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 269/272] 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 270/272] 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 271/272] 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 272/272] 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 = ''