From a20dc12b5e7972bb80c25c5a51400bedb36c53c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Dec 2024 20:15:44 +0000 Subject: [PATCH 01/37] python312Packages.google-cloud-artifact-registry: 1.13.1 -> 1.14.0 --- .../python-modules/google-cloud-artifact-registry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix index 3e313d3ba0db..0e3bf68348b6 100644 --- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix +++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-artifact-registry"; - version = "1.13.1"; + version = "1.14.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_artifact_registry"; inherit version; - hash = "sha256-wbr6WfuA9n94DK/B0OKS8PrnP1tiCRORKGXtDv6vU0Q="; + hash = "sha256-xn4OBhidFxwfNHcCoXecZqMbGyFNIJ75f5u75Fi5yQ4="; }; build-system = [ setuptools ]; From 05a2eef947121aec7eca9def9676402edadc7e23 Mon Sep 17 00:00:00 2001 From: Adam Dinwoodie Date: Fri, 3 Jan 2025 21:19:35 +0000 Subject: [PATCH 02/37] cardimpose: 0.2.1 -> 0.2.1-unstable-2024-12-28 --- .../python-modules/cardimpose/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/cardimpose/default.nix b/pkgs/development/python-modules/cardimpose/default.nix index fc4382b2af3b..5983f55a5aee 100644 --- a/pkgs/development/python-modules/cardimpose/default.nix +++ b/pkgs/development/python-modules/cardimpose/default.nix @@ -1,18 +1,20 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, pymupdf, }: buildPythonPackage rec { pname = "cardimpose"; - version = "0.2.1"; + version = "0.2.1-unstable-2024-12-28"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-7GyLTUzWd9cZ8/k+0FfzKW3H2rKZ3NHqkZkNmiQ+Tec="; + src = fetchFromGitHub { + owner = "frsche"; + repo = "cardimpose"; + rev = "eb26a9795e20db3e3dd5b62dbcbbad547cb05a55"; + hash = "sha256-Fel0YOe2D76h+QAon/wxI6EsZhfLca+0ncNi9i888+E="; }; build-system = [ setuptools ]; From 0e8ed1430ef1df466ee04df90f42108690ef2ea5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jan 2025 13:47:44 +0000 Subject: [PATCH 03/37] nwjs-ffmpeg-prebuilt: 0.94.0 -> 0.94.1 --- pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix index c17f47d9bcac..59820c6de0ff 100644 --- a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix +++ b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix @@ -7,7 +7,7 @@ let bits = if stdenv.hostPlatform.is64bit then "x64" else "ia32"; - version = "0.94.0"; + version = "0.94.1"; in stdenv.mkDerivation { pname = "nwjs-ffmpeg-prebuilt"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { src = let hashes = { - "x64" = "sha256-lepsr2/sCEUrq+an/z2g4Auj7MZcDT5I9PAKlFIbkpQ="; - "ia32" = "sha256-lepsr2/sCEUrq+an/z2g4Auj7MZcDT5I9PAKlFIbkpQ="; + "x64" = "sha256-FlhYfEUmmB4kgy2QT3e3cniNY/8eBYD4p2c23oTnEJU="; + "ia32" = "sha256-FlhYfEUmmB4kgy2QT3e3cniNY/8eBYD4p2c23oTnEJU="; }; in fetchurl { From 173fc04efdf2ad87a0533927a219a0d002db8d37 Mon Sep 17 00:00:00 2001 From: Mathias Zhang Date: Thu, 9 Jan 2025 01:25:26 +0800 Subject: [PATCH 04/37] flaca: 3.1.6 -> 3.2.0 --- pkgs/by-name/fl/flaca/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fl/flaca/package.nix b/pkgs/by-name/fl/flaca/package.nix index 6e5add17471a..4cdfaa4b7061 100644 --- a/pkgs/by-name/fl/flaca/package.nix +++ b/pkgs/by-name/fl/flaca/package.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { pname = "flaca"; - version = "3.1.6"; + version = "3.2.0"; src = let @@ -17,11 +17,11 @@ rustPlatform.buildRustPackage rec { owner = "Blobfolio"; repo = pname; rev = "v${version}"; - hash = "sha256-mNCb9d7/nRWSkiir2bYkslw/F2GmjvE0cPi7HhzEN68="; + hash = "sha256-pT3CizoqMQe+JljuDbV7hQpUmG+fx/ES2reupeX60iY="; }; lockFile = fetchurl { url = "https://github.com/Blobfolio/flaca/releases/download/v${version}/Cargo.lock"; - hash = "sha256-tyxTgYEGROCtoiKPX57pF32UcfpDCuMdFSttZu++ju8="; + hash = "sha256-Ek33acdDA9iMgpyIdx12arKtPHoKaIrfh5GNdgT7ib0="; }; in runCommand "source-with-lock" { nativeBuildInputs = [ lndir ]; } '' @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - cargoHash = "sha256-YYNWCJT5ZT36v4u4P3gtW/osor6eIvR8leqlQHHZYMk="; + cargoHash = "sha256-n8GDe8OVmHYgBaSp9Zb7Z/F2orDAR6d82Tikrd0y6Ts="; meta = with lib; { description = "CLI tool to losslessly compress JPEG and PNG images"; From 5bfaa707168a3bd4f352c8fb2a61ea3ffc570896 Mon Sep 17 00:00:00 2001 From: arthsmn Date: Wed, 8 Jan 2025 22:19:43 -0300 Subject: [PATCH 05/37] scribus: 1.6.2 -> 1.6.3 --- pkgs/applications/office/scribus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 2d67bd99c12b..c8e6d116bc9a 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -32,11 +32,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "scribus"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { url = "mirror://sourceforge/scribus/scribus-devel/scribus-${finalAttrs.version}.tar.xz"; - hash = "sha256-fv+bH0fjcuVrs2nx2+GP5JEBeJtea8/beJDgNGtkE4M="; + hash = "sha256-CuWM7UEBAegmVeO0wgoHDPF2cUWtojPc73wguLpr1Ic="; }; nativeBuildInputs = [ From ddca1e6f3523516ded661ae966158ef529bf971d Mon Sep 17 00:00:00 2001 From: uxodb <20535246+uxodb@users.noreply.github.com> Date: Fri, 10 Jan 2025 07:26:14 +0100 Subject: [PATCH 06/37] maintainers: add uxodb --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a3cc89d57ed7..1c2db749149b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -23756,6 +23756,12 @@ githubId = 2212422; name = "uwap"; }; + uxodb = { + name = "uxodb"; + matrix = "@uxodb:matrix.org"; + github = "uxodb"; + githubId = 20535246; + }; V = { name = "V"; email = "v@anomalous.eu"; From 6029d36956d21b7a636f50edecb52f7452ec5a44 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Thu, 9 Jan 2025 12:42:25 +0100 Subject: [PATCH 07/37] opensnitch-ui: fix runtime crash this broke in PR #370048 / commit 293f832365699e6e028737ac1ad35b7428c97da5, as the packaging python package is now required at runtime --- pkgs/by-name/op/opensnitch-ui/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/op/opensnitch-ui/package.nix b/pkgs/by-name/op/opensnitch-ui/package.nix index 74440f506d7b..094625d846de 100644 --- a/pkgs/by-name/op/opensnitch-ui/package.nix +++ b/pkgs/by-name/op/opensnitch-ui/package.nix @@ -34,6 +34,7 @@ python311Packages.buildPythonApplication rec { propagatedBuildInputs = with python311Packages; [ grpcio-tools notify2 + packaging pyasn pyinotify pyqt5 From bb9fc9fba944d4f1535d5b9ff19b742a7a2f76d3 Mon Sep 17 00:00:00 2001 From: genga Date: Fri, 10 Jan 2025 09:22:18 +0300 Subject: [PATCH 08/37] gssg: init at 0-unstable-2023-05-29 gssg: add passthru script --- pkgs/by-name/gs/gssg/package.nix | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/gs/gssg/package.nix diff --git a/pkgs/by-name/gs/gssg/package.nix b/pkgs/by-name/gs/gssg/package.nix new file mode 100644 index 000000000000..ad71b49f0737 --- /dev/null +++ b/pkgs/by-name/gs/gssg/package.nix @@ -0,0 +1,37 @@ +{ + lib, + fetchFromSourcehut, + buildGoModule, + unstableGitUpdater, +}: + +buildGoModule { + pname = "gssg"; + version = "0-unstable-2023-05-29"; + + src = fetchFromSourcehut { + owner = "~gsthnz"; + repo = "gssg"; + rev = "fc755f281d750d0b022689d58d0f32e6799dfef8"; + hash = "sha256-m0bVH6upLSA1dcxds3VJFFaSYs7YoMuoAmEe5qAUTmw="; + }; + + vendorHash = "sha256-NxfZbwKo8SY0XfWivQ42cNqIbJQ1EBsxPFr70ZU9G6E="; + + ldFlags = [ + "-s" + "-w" + ]; + + passthru = { + updateScript = unstableGitUpdater { }; + }; + + meta = { + description = "Gemini static site generator"; + homepage = "https://git.sr.ht/~gsthnz/gssg"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ genga898 ]; + mainProgram = "gssg"; + }; +} From c0212b5665b3da8a22dfdbbd71cf98eccf46c970 Mon Sep 17 00:00:00 2001 From: Peter Frank Date: Sun, 12 Jan 2025 20:36:04 +0100 Subject: [PATCH 09/37] surrealist 3.0.8 -> 3.1.9 --- pkgs/by-name/su/surrealist/package.nix | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix index e13a41c1bca1..8f0cc06876ec 100644 --- a/pkgs/by-name/su/surrealist/package.nix +++ b/pkgs/by-name/su/surrealist/package.nix @@ -1,16 +1,18 @@ { buildGoModule, cairo, - cargo, cargo-tauri, + cargo, esbuild, fetchFromGitHub, gdk-pixbuf, glib-networking, gobject-introspection, + jq, lib, libsoup_3, makeBinaryWrapper, + moreutils, nodejs, openssl, pango, @@ -48,13 +50,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "surrealist"; - version = "3.0.8"; + version = "3.1.9"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealist"; rev = "surrealist-v${finalAttrs.version}"; - hash = "sha256-46CXldjhWc7H6wdKfMK2IlmBqfe0QHi/J1uFhbV42HY="; + hash = "sha256-p+Tyu65A+vykqafu1RCRKYFXb435Uyu9WxUoEqjI8d8="; }; # HACK: A dependency (surrealist -> tauri -> **reqwest**) contains hyper-tls @@ -70,23 +72,25 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) patches src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; - hash = "sha256-HmdEcjgxPyRsQqhU0P/C3KVgwZsSvfHjyzj0OHKe5jY"; + hash = "sha256-8rw3x17f5pLLyvxozFPWq9pJNHy4wXwV9CcaUGAbdd0="; patchFlags = [ "-p2" ]; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-uBDbBfWC9HxxzY1x4+rNo87D5C1zZa2beFLa5NkLs80="; + hash = "sha256-JwOY6Z8UjbrodSQ3csnT+puftbQUDF3NIK7o6rSpl2o="; }; nativeBuildInputs = [ cargo cargo-tauri.hook gobject-introspection + jq makeBinaryWrapper + moreutils nodejs - pnpm.configHook pkg-config + pnpm.configHook rustc rustPlatform.cargoSetupHook ]; @@ -108,6 +112,15 @@ stdenv.mkDerivation (finalAttrs: { cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; + # Deactivate the upstream update mechanism + postPatch = '' + jq ' + .bundle.createUpdaterArtifacts = false | + .plugins.updater = {"active": false, "pubkey": "", "endpoints": []} + ' \ + src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json + ''; + postFixup = '' wrapProgram "$out/bin/surrealist" \ --set GIO_EXTRA_MODULES ${glib-networking}/lib/gio/modules \ From d3fc0b6220e610949cb7706c0f80b23b1d4d3b01 Mon Sep 17 00:00:00 2001 From: jthulhu Date: Tue, 14 Jan 2025 07:31:40 +0100 Subject: [PATCH 10/37] lean4: 4.12.0 -> 4.13.0 Release notes: https://github.com/leanprover/lean4/releases/tag/v4.13.0 --- pkgs/by-name/le/lean4/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/lean4/package.nix b/pkgs/by-name/le/lean4/package.nix index 6ad44fd0144f..63447e110c1d 100644 --- a/pkgs/by-name/le/lean4/package.nix +++ b/pkgs/by-name/le/lean4/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lean4"; - version = "4.12.0"; + version = "4.13.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; rev = "v${finalAttrs.version}"; - hash = "sha256-O2Egyh2D0TfQWzQKfHUeAh7qAjMfeLVwXwGUw5QqcvE="; + hash = "sha256-UemA3H0YxdrXQ/6uG6YFphj/6ab2jb0zbRkDZaMSXok="; }; postPatch = '' From ed3033393ead7b19737a8dbc9702833a5eda2fe1 Mon Sep 17 00:00:00 2001 From: jthulhu Date: Mon, 13 Jan 2025 20:22:13 +0100 Subject: [PATCH 11/37] lean4: 4.13.0 -> 4.14.0 Release notes: https://github.com/leanprover/lean4/releases/tag/v4.14.0 Moved `cadical` from nativeBuildInputs to buildInputs, because it doesn't build otherwise. Enforced failure of build if the substitution in CMakeLists fails. --- pkgs/by-name/le/lean4/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/le/lean4/package.nix b/pkgs/by-name/le/lean4/package.nix index 63447e110c1d..2e2ba3e6631a 100644 --- a/pkgs/by-name/le/lean4/package.nix +++ b/pkgs/by-name/le/lean4/package.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "lean4"; - version = "4.13.0"; + version = "4.14.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; rev = "v${finalAttrs.version}"; - hash = "sha256-UemA3H0YxdrXQ/6uG6YFphj/6ab2jb0zbRkDZaMSXok="; + hash = "sha256-xVQCbZLVSI+UiFoimw7TK1P5DQca412ss/9z3LzaxCQ="; }; postPatch = '' substituteInPlace src/CMakeLists.txt \ - --replace 'set(GIT_SHA1 "")' 'set(GIT_SHA1 "${finalAttrs.src.rev}")' + --replace-fail 'set(GIT_SHA1 "")' 'set(GIT_SHA1 "${finalAttrs.src.rev}")' # Remove tests that fails in sandbox. # It expects `sourceRoot` to be a git repository. @@ -37,12 +37,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - cadical ]; buildInputs = [ gmp libuv + cadical ]; nativeCheckInputs = [ From 49b8bad2d783dfe7180b94f178c176f80954c659 Mon Sep 17 00:00:00 2001 From: jthulhu Date: Mon, 13 Jan 2025 22:09:29 +0100 Subject: [PATCH 12/37] lean4: 4.14.0 -> 4.15.0 Release notes: https://github.com/leanprover/lean4/releases/tag/v4.15.0 --- pkgs/by-name/le/lean4/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/lean4/package.nix b/pkgs/by-name/le/lean4/package.nix index 2e2ba3e6631a..5feafb9d2969 100644 --- a/pkgs/by-name/le/lean4/package.nix +++ b/pkgs/by-name/le/lean4/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lean4"; - version = "4.14.0"; + version = "4.15.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; rev = "v${finalAttrs.version}"; - hash = "sha256-xVQCbZLVSI+UiFoimw7TK1P5DQca412ss/9z3LzaxCQ="; + hash = "sha256-Xzuk41voBP93vsl3u/bBii9Y6DMfvi6UazKiLLABgHA="; }; postPatch = '' From 9d87b1114204da3306a22ecf34fa340e9c7314e9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 7 Jan 2025 19:34:35 +0100 Subject: [PATCH 13/37] python312Packages.keras: 3.7.0 -> 3.8.0 Diff: https://github.com/keras-team/keras/compare/refs/tags/v3.7.0...v3.8.0 Changelog: https://github.com/keras-team/keras/releases/tag/v3.8.0 --- .../python-modules/keras/default.nix | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 87f241d3b2ab..4b871998f851 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -9,21 +9,22 @@ # dependencies absl-py, + distutils, h5py, ml-dtypes, namex, numpy, + onnxruntime, optree, packaging, - rich, - tensorflow, pythonAtLeast, - distutils, + rich, + scikit-learn, + tensorflow, # tests dm-tree, jax, - jaxlib, pandas, pydot, pytestCheckHook, @@ -33,14 +34,14 @@ buildPythonPackage rec { pname = "keras"; - version = "3.7.0"; + version = "3.8.0"; pyproject = true; src = fetchFromGitHub { owner = "keras-team"; repo = "keras"; tag = "v${version}"; - hash = "sha256-qidY1OmlOYPKVoxryx1bEukA7IS6rPV4jqlnuf3y39w="; + hash = "sha256-sbAGiI1Ai0MPiQ8AMpa5qX6hYt/plsIqhn9xYLBb120="; }; build-system = [ @@ -53,9 +54,11 @@ buildPythonPackage rec { ml-dtypes namex numpy + onnxruntime optree packaging rich + scikit-learn tensorflow ] ++ lib.optionals (pythonAtLeast "3.12") [ distutils ]; @@ -66,7 +69,6 @@ buildPythonPackage rec { nativeCheckInputs = [ dm-tree - jaxlib jax pandas pydot @@ -81,6 +83,9 @@ buildPythonPackage rec { disabledTests = [ + # Requires onnx which is currently broken + "test_export_onnx" + # Tries to install the package in the sandbox "test_keras_imports" @@ -99,6 +104,9 @@ buildPythonPackage rec { ]; disabledTestPaths = [ + # Require onnx which is currently broken + "keras/src/export/onnx_test.py" + # Datasets are downloaded from the internet "integration_tests/dataset_tests" @@ -121,7 +129,6 @@ buildPythonPackage rec { # TypeError: this __dict__ descriptor does not support '_DictWrapper' objects "keras/src/backend/tensorflow/saved_model_test.py" - "keras/src/export/export_lib_test.py" # KeyError: 'Unable to synchronously open object (bad object header version number)' "keras/src/saving/file_editor_test.py" From b13426b24762d7dcdb97a93cf8ac18f5cdb1d6c1 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 8 Jan 2025 00:37:36 +0100 Subject: [PATCH 14/37] python312Packages.torchrl: skip flaky test on aarch64-linux --- .../python-modules/torchrl/default.nix | 74 ++++++++++--------- 1 file changed, 40 insertions(+), 34 deletions(-) diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix index d84e66034801..759ce4b4b5dc 100644 --- a/pkgs/development/python-modules/torchrl/default.nix +++ b/pkgs/development/python-modules/torchrl/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -132,46 +133,51 @@ buildPythonPackage rec { ++ optional-dependencies.gym-continuous ++ optional-dependencies.rendering; - disabledTests = [ - # torchrl is incompatible with gymnasium>=1.0 - # https://github.com/pytorch/rl/discussions/2483 - "test_resetting_strategies" - "test_torchrl_to_gym" + disabledTests = + [ + # torchrl is incompatible with gymnasium>=1.0 + # https://github.com/pytorch/rl/discussions/2483 + "test_resetting_strategies" + "test_torchrl_to_gym" - # mujoco.FatalError: an OpenGL platform library has not been loaded into this process, this most likely means that a valid OpenGL context has not been created before mjr_makeContext was called - "test_vecenvs_env" + # mujoco.FatalError: an OpenGL platform library has not been loaded into this process, this most likely means that a valid OpenGL context has not been created before mjr_makeContext was called + "test_vecenvs_env" - # ValueError: Can't write images with one color channel. - "test_log_video" + # ValueError: Can't write images with one color channel. + "test_log_video" - # Those tests require the ALE environments (provided by unpackaged shimmy) - "test_collector_env_reset" - "test_gym" - "test_gym_fake_td" - "test_recorder" - "test_recorder_load" - "test_rollout" - "test_parallel_trans_env_check" - "test_serial_trans_env_check" - "test_single_trans_env_check" - "test_td_creation_from_spec" - "test_trans_parallel_env_check" - "test_trans_serial_env_check" - "test_transform_env" + # Those tests require the ALE environments (provided by unpackaged shimmy) + "test_collector_env_reset" + "test_gym" + "test_gym_fake_td" + "test_recorder" + "test_recorder_load" + "test_rollout" + "test_parallel_trans_env_check" + "test_serial_trans_env_check" + "test_single_trans_env_check" + "test_td_creation_from_spec" + "test_trans_parallel_env_check" + "test_trans_serial_env_check" + "test_transform_env" - # undeterministic - "test_distributed_collector_updatepolicy" - "test_timeit" + # undeterministic + "test_distributed_collector_updatepolicy" + "test_timeit" - # On a 24 threads system - # assert torch.get_num_threads() == max(1, init_threads - 3) - # AssertionError: assert 23 == 21 - "test_auto_num_threads" + # On a 24 threads system + # assert torch.get_num_threads() == max(1, init_threads - 3) + # AssertionError: assert 23 == 21 + "test_auto_num_threads" - # Flaky (hangs indefinitely on some CPUs) - "test_gae_multidim" - "test_gae_param_as_tensor" - ]; + # Flaky (hangs indefinitely on some CPUs) + "test_gae_multidim" + "test_gae_param_as_tensor" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # Flaky (AssertionError) + "test_vecnorm_parallel_auto" + ]; meta = { description = "Modular, primitive-first, python-first PyTorch library for Reinforcement Learning"; From 0f346649113229d803e24244a6bca886c4675672 Mon Sep 17 00:00:00 2001 From: uxodb <20535246+uxodb@users.noreply.github.com> Date: Sun, 12 Jan 2025 22:13:45 +0100 Subject: [PATCH 15/37] sddm-astronaut: 1.0 -> 1.0-unstable-2025-01-05 --- pkgs/data/themes/sddm-astronaut/default.nix | 26 ++++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/data/themes/sddm-astronaut/default.nix b/pkgs/data/themes/sddm-astronaut/default.nix index e636c05ff328..21bf75833449 100644 --- a/pkgs/data/themes/sddm-astronaut/default.nix +++ b/pkgs/data/themes/sddm-astronaut/default.nix @@ -3,22 +3,25 @@ lib, stdenvNoCC, themeConfig ? null, + embeddedTheme ? "astronaut", }: stdenvNoCC.mkDerivation rec { pname = "sddm-astronaut"; - version = "1.0"; + version = "1.0-unstable-2025-01-05"; src = pkgs.fetchFromGitHub { owner = "Keyitdev"; repo = "sddm-astronaut-theme"; - rev = "48ea0a792711ac0c58cc74f7a03e2e7ba3dc2ac0"; - hash = "sha256-kXovz813BS+Mtbk6+nNNdnluwp/7V2e3KJLuIfiWRD0="; + rev = "11c0bf6147bbea466ce2e2b0559e9a9abdbcc7c3"; + hash = "sha256-gBSz+k/qgEaIWh1Txdgwlou/Lfrfv3ABzyxYwlrLjDk="; }; dontWrapQtApps = true; + propagatedBuildInputs = with pkgs.kdePackages; [ - qt5compat qtsvg + qtmultimedia + qtvirtualkeyboard ]; installPhase = @@ -27,13 +30,21 @@ stdenvNoCC.mkDerivation rec { configFile = iniFormat.generate "" { General = themeConfig; }; basePath = "$out/share/sddm/themes/sddm-astronaut-theme"; + sedString = "ConfigFile=Themes/"; in '' mkdir -p ${basePath} cp -r $src/* ${basePath} '' + + lib.optionalString (embeddedTheme != "astronaut") '' + + # Replaces astronaut.conf with embedded theme in metadata.desktop on line 9. + # ConfigFile=Themes/astronaut.conf. + sed -i "s|^${sedString}.*\\.conf$|${sedString}${embeddedTheme}.conf|" ${basePath}/metadata.desktop + '' + lib.optionalString (themeConfig != null) '' - ln -sf ${configFile} ${basePath}/theme.conf.user + chmod u+w ${basePath}/Themes/ + ln -sf ${configFile} ${basePath}/Themes/${embeddedTheme}.conf.user ''; meta = { @@ -42,6 +53,9 @@ stdenvNoCC.mkDerivation rec { license = lib.licenses.gpl3; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ danid3v ]; + maintainers = with lib.maintainers; [ + danid3v + uxodb + ]; }; } From c0954a8d2f38776b5766ffba1eadd40e876d86a4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 14 Jan 2025 09:07:34 +0100 Subject: [PATCH 16/37] python312Packages.levenshtein: 0.26.0 -> 0.27.0 Diff: https://github.com/maxbachmann/Levenshtein/compare/refs/tags/v0.26.0...v0.27.0 Changelog: https://github.com/maxbachmann/Levenshtein/blob/refs/tags/v0.27.0/HISTORY.md --- .../python-modules/levenshtein/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 367c6f0eb1ec..9e8ea3dec57c 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -1,29 +1,26 @@ { lib, buildPythonPackage, + fetchFromGitHub, cmake, cython, - fetchFromGitHub, ninja, - pytestCheckHook, - pythonOlder, - rapidfuzz, - rapidfuzz-cpp, scikit-build-core, + rapidfuzz-cpp, + rapidfuzz, + pytestCheckHook, }: buildPythonPackage rec { pname = "levenshtein"; - version = "0.26.0"; + version = "0.27.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "maxbachmann"; repo = "Levenshtein"; tag = "v${version}"; - hash = "sha256-uLOOAmJ8Y0z+tuIIOSnI8qZoZ+IA2+tNBX1lDCvc8+A="; + hash = "sha256-kiYu46qv8sBBcPoCo3PN1q9F0EJ1s5hAMKavPaztM4s="; fetchSubmodules = true; # # for vendored `rapidfuzz-cpp` }; @@ -44,11 +41,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "Levenshtein" ]; - meta = with lib; { + meta = { description = "Functions for fast computation of Levenshtein distance and string similarity"; homepage = "https://github.com/maxbachmann/Levenshtein"; - changelog = "https://github.com/maxbachmann/Levenshtein/blob/${src.rev}/HISTORY.md"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ fab ]; + changelog = "https://github.com/maxbachmann/Levenshtein/blob/v${version}/HISTORY.md"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ fab ]; }; } From b40c477768ba2f9a9474c029c086b178ee560124 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 14 Jan 2025 13:32:33 +0100 Subject: [PATCH 17/37] python312Packages.google-auth-oauthlib: fix build in darwin sandbox --- .../google-auth-oauthlib/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 2d4e0bed73ac..e70ffa46a06d 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -4,12 +4,11 @@ buildPythonPackage, fetchPypi, setuptools, + google-auth, + requests-oauthlib, click, mock, pytestCheckHook, - google-auth, - requests-oauthlib, - pythonOlder, }: buildPythonPackage rec { @@ -17,8 +16,6 @@ buildPythonPackage rec { version = "1.2.1"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchPypi { pname = "google_auth_oauthlib"; inherit version; @@ -53,12 +50,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "google_auth_oauthlib" ]; - meta = with lib; { + __darwinAllowLocalNetworking = true; + + meta = { description = "Google Authentication Library: oauthlib integration"; homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib"; changelog = "https://github.com/googleapis/google-auth-library-python-oauthlib/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ terlar ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ terlar ]; mainProgram = "google-oauthlib-tool"; }; } From 523ea14022449e9798c9d06a46cba00d7b7e780d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 14:04:51 +0000 Subject: [PATCH 18/37] thunderbird-bin-unwrapped: 128.5.2esr -> 128.6.0esr --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 76255bea585b..65927dd70f0f 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,797 +1,797 @@ { - version = "128.5.2esr"; + version = "128.6.0esr"; sources = [ { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/af/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/af/thunderbird-128.6.0esr.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "e73b10a8d9e40ecd96db4b93878f37fc31081c85f553dd14507bf79d24b858a5"; + sha256 = "147169c7e5d3bb763fa87c4f7627f9ddec6493fa7833656021d102df897d2b2b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/ar/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ar/thunderbird-128.6.0esr.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "132d3290d331bde59430e6b3c112f5c8f192168c7ccfc9257fd259170af36a0c"; + sha256 = "eaf250a43059ab0d255ea7b1a96f55baa9287c88b2faf5269fc574df70e5731c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/ast/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ast/thunderbird-128.6.0esr.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "3d51f55ad635abe4c9704fb892c164ca3a2a5f1ed4ae566e92c2189bc7a27783"; + sha256 = "0a66cbf7d5defd48c433784eab0b0b457c11971eac0d4d2f45a735818a23ec02"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/be/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/be/thunderbird-128.6.0esr.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "adedd236013a8e1e0e00bbfd10221334232913ff38f5f34273fd0e5cbc355d41"; + sha256 = "bb475d2f103966cf26e2837333124310cd9e943ee86ec01e524b884f438af6fa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/bg/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/bg/thunderbird-128.6.0esr.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "a660ba1d0570ee4bbc10c899929cd72083fdcd80916858d44d5a38790415227b"; + sha256 = "86f3ff01453cfe8156de06b23b4b7a08bc75bd6a7703b3851b145d0e334116c6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/br/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/br/thunderbird-128.6.0esr.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "81a49db4cc98f56bb1eb8a8aa340a03ffba7cdc0726e2ef23943503ad2c3c487"; + sha256 = "cd2df9f9970e80e9cf97d658b0157d900dda0f2ecd8be225f40d132143874d88"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/ca/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ca/thunderbird-128.6.0esr.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "9bee3b2d32526aef2d652a70fe15b9cef220553dbca91d3a43154ab06631b39d"; + sha256 = "0684f9615fd8324cea414b2b0d95a86bf361190ac41281805957cf70c1005457"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/cak/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/cak/thunderbird-128.6.0esr.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "fac50c050a1423e38785e93029352766904161f0b5629f0324ee273ec9a86e33"; + sha256 = "d2c40cd642b5e5b0a81c9d2cf0f1b034b17453dfdff100765874ff684e0bbf17"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/cs/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/cs/thunderbird-128.6.0esr.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "5c14bc65bf6adbdf538e14bff42348786498caeac9bd6b2cd5a3d60cd196f131"; + sha256 = "2d2324de917822676da6a13173e3fbd541abdeff2ae3cbbb9adab7c9321fe280"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/cy/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/cy/thunderbird-128.6.0esr.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "14103b894dc995b4f402b7b27a4555ff401c368d2e25cab15ce78a63bbd20995"; + sha256 = "8a57b789bfa683781d24cc3c74fe5ca5e28aa55d790bbfe2ec9113816cbad0ac"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/da/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/da/thunderbird-128.6.0esr.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "cfa90363282c0d7fa976b179d73d2260e257e3e028769204f5c299f137f60bdf"; + sha256 = "1a58db475780f1aa0c2d487f826e83d2da592dd3f2bf296a19406ca5ee4ff864"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/de/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/de/thunderbird-128.6.0esr.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "24aee57c98140660e4ad6dc89fbd61758aeea823a7ed682de8b6916bc9a54ce0"; + sha256 = "7c5c2ef5e276cc9214d19235a913c1345cc1fcf967c0ca1abc0c935427188df4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/dsb/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/dsb/thunderbird-128.6.0esr.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "7fd2e3c788e2ef2eab12616271d7b8a4f1ed2e9ab6ef43e0b6617ca0aa0e6351"; + sha256 = "b1fc585a9a57506d5852b5ced928ee26b27569bd11a6e31d1d362a2ce0e80e29"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/el/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/el/thunderbird-128.6.0esr.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "c62f977f4af724bf6f7a4da25eb85e77b9ba6c5aaeb8d6165f9c43bb65d5918c"; + sha256 = "88ff0bf13a314a9228504b7af1c151935e56fb93fd5fec447c82df587439ec87"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/en-CA/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/en-CA/thunderbird-128.6.0esr.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "8878bf63c6b6a2ae5a7d56b7f4df52aadd053736ba0143ec52cfb15e57315de9"; + sha256 = "a27961dac518dbd07fbe65aee8dbd0a088f510b359644e67503a4c604a483cbf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/en-GB/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/en-GB/thunderbird-128.6.0esr.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "1810e254567c611dcc42481a19f3fcaa8cee499407ddcbae7fcfecfca0ae198c"; + sha256 = "315c95f6ae7aa96682d8db8f091a8fdb66f1d071e96ccb23394cc7b0e041b32d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/en-US/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/en-US/thunderbird-128.6.0esr.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "1ac9ca9c9e2aa304ee1735b3667f9189eefd639ccfcb809ca8db1ea534f8345c"; + sha256 = "f8e7fdd9a29a196be4e3af54760ad6987d40180644bae4afb68bbf63f931f2b8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/es-AR/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/es-AR/thunderbird-128.6.0esr.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "22d10810a4e4a73ae0226effd60e0ed7c5600ba5a79d207abaad97adce3cfa42"; + sha256 = "1a166113f8c3d38ff12dddd0193a45823ab623ed28bd8348025d45afd6c969a6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/es-ES/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/es-ES/thunderbird-128.6.0esr.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "5e300f5f773dbe5248e385a41f808460e53902c7afc6a36d2bb4af971678d2bd"; + sha256 = "11fe857aa1ec54fb135840b3763dc5373eccd302b65028c9b8e3ff1d238a5c82"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/es-MX/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/es-MX/thunderbird-128.6.0esr.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "ca9fe6d3c498a069c921dbcaeef58bd3d2a6482acb945fdc57ec06c2b31b0cde"; + sha256 = "10922d63aedd1e472d804a29572d084f9a49bd014072815b195ac04ee8959fa0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/et/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/et/thunderbird-128.6.0esr.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "68867af322f9963768694fd2f5128de06319a7f7ab397226726f3a521139fb80"; + sha256 = "26f2876b278747de85c888c59abb639ce715ea2b849a3317c69192eb4690366d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/eu/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/eu/thunderbird-128.6.0esr.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "0b6590d4ef81ba9247004ada1b5ef5dd9263dfd6e112340cd5fd6cd4a49819bd"; + sha256 = "b9446b2f5bb87bb5ad9074e4295559d9aedfc790af7f5e1ae74077f93165eda4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/fi/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/fi/thunderbird-128.6.0esr.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "2b44ed65368d85177409b4b99c478af4206087fb9cda6e5dd937b57d4d263283"; + sha256 = "e85e265b8b21839dbe09af3b860bc7c30c62678758f42542a3f2e73bec9b9300"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/fr/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/fr/thunderbird-128.6.0esr.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "650038253f5907e3e6b9fb709b7d51ba0e9cdb3a20f67896380393ac41e1cdf8"; + sha256 = "6c77bc7aec3e985c4ddc17e51bd659d8f4c68811e3e04dd5c27eaa37f48e4ebe"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/fy-NL/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/fy-NL/thunderbird-128.6.0esr.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "d452e4ada6d32ce656624c039debf68114eed44d82e17e4de35600897265a960"; + sha256 = "a57e8c11a14e7418ef198c2acd566a4e3581cc9eda3ecb4fe8e1e219b27594f3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/ga-IE/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ga-IE/thunderbird-128.6.0esr.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "9fe6cd641b035d85cd3027d064dcdf19031d2094aae2b0adb9b85cdb3f504e57"; + sha256 = "aed8de9226564d4ee4bb6869cc0421c435878d31103e87af21f393ba68c36ae3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/gd/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/gd/thunderbird-128.6.0esr.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "ce6a3e33ba9a7042fb377ae51516e7a8b965e548f6f594e5f980dd3320aeacd1"; + sha256 = "0cf99116e8534cb21696c0675d7bba710f27559d3d82d5e72a64daac16c1c7f4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/gl/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/gl/thunderbird-128.6.0esr.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "e457d77bb51f2efb7fa47a5dc3fa3399dafb2a66e829ed173e28caa723aab955"; + sha256 = "3354f923b02c9c13d45c8a08c2f5e47fad5bac133563bcaf164a57c68d5bba92"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/he/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/he/thunderbird-128.6.0esr.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "7edb78ec181f1135803430acc7f7675ad11cf7a608cd71044cbdc3c88b820985"; + sha256 = "461f8f59ea9699a1e74a1b27cbdcff05b52b8f126e8e97a0f037952a8b536cf0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/hr/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/hr/thunderbird-128.6.0esr.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "b1e4fbd25524048935640bd7fbec9684c329c9a701520302455498a5454978a4"; + sha256 = "7fb6430e834532e43bd87b246058adeef11dd77adc850b8672fd04f3d6d6060a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/hsb/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/hsb/thunderbird-128.6.0esr.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "1c4946dcd5d18c02d7f5bf8c183998b82b4a537887618740aca68290e8349714"; + sha256 = "e727fa3ff2617962157473b20e31bfdb99c59c35ec3e6cb10046211bfd47723d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/hu/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/hu/thunderbird-128.6.0esr.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "f9f041bbd9a5d484e3be78133e16965488d41f6f707cb52a5eac1caa688555ad"; + sha256 = "c8d6f822508d7a68c65927b14105ddea413835a518d348bca4f41ef61bf11a94"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/hy-AM/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/hy-AM/thunderbird-128.6.0esr.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "1ff94e46e03f890cffdc2b05906759630b88d73d8b265b242b87cc1f7a92818d"; + sha256 = "da532b67da698cdc025a5320b4e11f630eb8982ed389c1c60fc3c942bdfb4034"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/id/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/id/thunderbird-128.6.0esr.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "e8b6e07a22b488e8965b9926930591a29773b36180f8b3a7bbc10beaf73fc4aa"; + sha256 = "05ae0434947fbacd738b24941633db92a21ef8936703706cdaeb311f98cacab2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/is/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/is/thunderbird-128.6.0esr.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "699be72c00ed0ccc06d7999415b638396cd5f7b5d7c7572d12c50d59bf1cc78e"; + sha256 = "4f506da3c5677cb9fe600e31a9e37b398f00200a403365f8e68f89c8a0eb6bf0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/it/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/it/thunderbird-128.6.0esr.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "412f24529759ab8daaa8a22dcb3b6a1587c44214479b1a9946a70c9c117e4f5e"; + sha256 = "9142f001b55718443937fa7bc2ac92584371e9b4a1d0d87ff84c272fc87fa74e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/ja/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ja/thunderbird-128.6.0esr.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "e57d8628a149cf6da3b653874ba379a5e84a419c72a78350033e3983ab6ff02b"; + sha256 = "965e2b5125ffbabce121c4efbd86cc796372ec969d8634d106a44fef2696c930"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/ka/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ka/thunderbird-128.6.0esr.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "f97c13968a2eb0c52aa37a4b22dc85bedb4cf300d373bf340e956ff3fefe1686"; + sha256 = "24b87f5590e83999c8a1b3970b5d0fa3bf98de9820573b0e1af49ced9ca7d29b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/kab/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/kab/thunderbird-128.6.0esr.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "0885808a8659b328dabba67215904332727bc79956c7b197a67546a4b2148c2b"; + sha256 = "2efdaf21264181251f39f165270e3e22103823750b9d4d35fb94784f95137d18"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/kk/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/kk/thunderbird-128.6.0esr.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "7a37191c7aa8a7c421c752379cc14a9ce705c5a517667f9aa082849c4bd20229"; + sha256 = "63820d662893a836a28159057e4ceb2042823d042e2c1f0ed833480817e3cedc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/ko/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ko/thunderbird-128.6.0esr.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "d28604e95463e600353ead6970b04ea30f943809a7c0ab52a797ca5235faf4ac"; + sha256 = "a1006fb62ca22730213805e9a8bde134bd88405b0068204eba0400880bb10cdd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/lt/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/lt/thunderbird-128.6.0esr.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "79cff99e2da9d4da40331ded5c69fe0f6836ea5ddd169b930f4a735946091e4d"; + sha256 = "60d9333c6633c828f4e491dc8a033a8940894875b9154433511573c31d4834a4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/lv/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/lv/thunderbird-128.6.0esr.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "eaf7bd34f88ba8cd251b31d105cca5e48854bfda4a25ebdeff96c91f097a0f27"; + sha256 = "edf454a5d2ed00f486aebbf505aa5ce8cf9b6d14f06f4645535cc08a1db2a445"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/ms/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ms/thunderbird-128.6.0esr.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "8c0afe7c25df0210202c2373fbfc346d9210beb26cf85f8e562e2726ae6dcf1b"; + sha256 = "2e6374ae36a01a0362a3ac8e9a616e8b80d9c31fbe8f89e58930e00bbb8ede93"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/nb-NO/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/nb-NO/thunderbird-128.6.0esr.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "64aec4507e0c2cbc8d434807a1a740e1f90992ef7d7d01b4431c243a7d88130b"; + sha256 = "85e121b6878115a304720f9ff8ad85ce757ce1cb520284973be199f51357b707"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/nl/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/nl/thunderbird-128.6.0esr.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "12a0b419b284580c87cc1cefb458a8a65369c92c4ccc2fec729bfd086ddcc558"; + sha256 = "306f6af60bee6174e0d7aab66b7cf21cfe383f9dce403c91fc867ce9a2c26944"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/nn-NO/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/nn-NO/thunderbird-128.6.0esr.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "b41578881f54225b6c18a86984aceb9550f82660da24f2a5827720921190c8ff"; + sha256 = "3aa2b9391365419cdf7a753206c962a932e7f5325505a3320ae57f3b781634d9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/pa-IN/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/pa-IN/thunderbird-128.6.0esr.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "7cae0a6a0ca762904eaf16e03df9d811a571696ef9657d3725c98f1051cb48e5"; + sha256 = "797ae91d608e7be252439b1fcd4536df1b030fb1f7267408c17b75cefda4c20b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/pl/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/pl/thunderbird-128.6.0esr.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "649d1813dbf9d9d0a39059f4aeaffb9c3a82329d84c02c2e9b35e6a9f34d4318"; + sha256 = "4ac87004c02e69159ae6875658cb7ed95ddd965fa3871ba7a89a82b6abd4f9f6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/pt-BR/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/pt-BR/thunderbird-128.6.0esr.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "37c7a69254ad91de267514b66a74a2c27dc0e8e75c730722c6c1c38ba11cffc2"; + sha256 = "40a3721ec6cd57f58e27ddb239e5026648bf9d75eafc417e4d61b5128c8e6a45"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/pt-PT/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/pt-PT/thunderbird-128.6.0esr.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "f902653826de549d8520ec35954cf371684498430ee9f56bf1bcf2329a851e25"; + sha256 = "860fb6f9ed881a18921a498f30d5559316e1d7934d974636951339221a2b4b57"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/rm/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/rm/thunderbird-128.6.0esr.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "02c2f03927cd5ee837f909aa683d1b11dfc1fb8e0dc6de3003196c923bb95ea6"; + sha256 = "b9c47fe2fdc79f0ab5cd6233aec9b8be4bda9537ea3fdba1290d28e6d2e38dcc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/ro/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ro/thunderbird-128.6.0esr.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "9c39be07f7b063926983e2f6cca0745f0c2d42706a3b483dc4f4a5b1d3abdb6e"; + sha256 = "aecc5113a2e86c6202cab6ce6278a2b7ff8b7228efba5e3de5dc3811d845c043"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/ru/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ru/thunderbird-128.6.0esr.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "8781ca988ab2ca4865e2cdf729952e51daed1dc49a4d7b9cdcf7d44a54156507"; + sha256 = "ab3903775cafe7907b28bf56d5f30e2d3d79055d84bd52469b26bf72ec8240c9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/sk/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/sk/thunderbird-128.6.0esr.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "dd7751520c90238e1411d3108e1edaebc3cb7704c42f1429d1dd4dd9949c2360"; + sha256 = "8ef99d4dc206ae86ccf4460206ff56e314e1e35d282f05f86944e462db119b8c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/sl/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/sl/thunderbird-128.6.0esr.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "ab12490cddd3760565ddce96a88bb57ec798b31d06eecbe0e19f9e4d2b3e08eb"; + sha256 = "c57ab55bd835e2d5bf8903a6a8db69ea456f93f1406167bffa9a9047b3747db3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/sq/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/sq/thunderbird-128.6.0esr.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "8df1d6b93d0742169a309ff99520fd76f19de14219ca7ec38c0fbb7ec3e9e7cb"; + sha256 = "8b8f216d54cf9e432e19ae07b2ac316684a8e1ba91e2dee7f8157f626c46b114"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/sr/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/sr/thunderbird-128.6.0esr.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "ff27929603f74d141534899b79b527ef1aeeaae3d642abcaf1ed1d32fc9ee63b"; + sha256 = "9212dbe44a7e39097b1d1a7860a06f4a7bdd45abe734b3c5bb7c04de0d766fec"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/sv-SE/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/sv-SE/thunderbird-128.6.0esr.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "ce20a0614e69e2c720ea3d1a8bdcc881a19b1333eb717f51ab5bce1f6e2d0eaf"; + sha256 = "1f1b6b76775b1643a6748b414c014c24c1fc84a09da4aad3ee7a3672ca5f0012"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/th/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/th/thunderbird-128.6.0esr.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "887c63504d60b403b388d9aeb8acef9d8c8a342830be9198d5badbc28f2c2d56"; + sha256 = "82f1ddd9b88b777162c947f09ef6add3e3050ab87ec5bb33d245b6fa14a603dd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/tr/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/tr/thunderbird-128.6.0esr.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "5fe9257c795e4037b4c66b90429585c21fd402a0e3b49492b08eb4f623dcf1d3"; + sha256 = "380bcfa6ec40a2fba1eb444e473baa521cbf4ee654ad63898e5f3829be746dc8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/uk/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/uk/thunderbird-128.6.0esr.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "7539ad2c01a3578565c7b725f2f10392f200251ab1c61752481b076aff546bb3"; + sha256 = "2a7052d5c51e53c0ab3b0703f7b33a3e870a123b8604416ef8c92dfcbad736e9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/uz/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/uz/thunderbird-128.6.0esr.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7d96771909f496e2b5a2bf8cd21cb84e2921f21238df2ef3e61e30cf6707d9cf"; + sha256 = "72148f0f1160f9fb93ea65e1dd6053a768e02b45f6ecfb3de68de4db4f635291"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/vi/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/vi/thunderbird-128.6.0esr.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "436d17c6bc1495031dedd86a9dfeab28cbaee46d06971d7184b49849f4acadfb"; + sha256 = "475abbbb400aea36414d787e98ce9095632e11436759da552ccdb4272adaacea"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/zh-CN/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/zh-CN/thunderbird-128.6.0esr.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "d84c3b4fef8ecdc985a4b5a259443019ba56d4b2227d678927f402d10fadaaca"; + sha256 = "b2d5ac008c57e7e48168b9712d6e90891bd5c517a891e4d0d4fcb6d5ae2cfb3c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-x86_64/zh-TW/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/zh-TW/thunderbird-128.6.0esr.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "266d35dbfac2fd449241fba7224a201209252344371beec144c2428cd0c9bd2b"; + sha256 = "01122295d0e40f896312eee085b9db6e696a9eede5f94a69651d39253f7cec2c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/af/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/af/thunderbird-128.6.0esr.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "6cd2f91556fce7e5b97c71312fe9529bb54542e4946eda1843b688718c05e777"; + sha256 = "62d59997921ad6f8867fd28d249c86c4879c2634e5766b498feaa68d0da38336"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/ar/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ar/thunderbird-128.6.0esr.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "8053f4a34be289cdc299ad6f0beb5bc4794fd4d2f086824b6008a23d4e0e4cbb"; + sha256 = "dbc05ffb01763cfbec843331d47772d8b53f0e700db0fa4d3ce0afc4a48814e3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/ast/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ast/thunderbird-128.6.0esr.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "84a52ae96f0b8b2a01431b9aa74ba152ed2ed82425a27f23581f631bbe26bc58"; + sha256 = "bdcc2cb138d79367087ac72d7fec609128cb983416bee6e3f57f18ba3f78741b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/be/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/be/thunderbird-128.6.0esr.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "7a131fb75ec0ba188fa35f1a9b795baf35a37574a7d4fcfbfa0534ec549ae625"; + sha256 = "ee1132188cca65f69cbef56287f930f685cc1c7f7e445b3eb819bd935ec7cb2e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/bg/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/bg/thunderbird-128.6.0esr.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "d28e4496714bcaf9a25721a356bf29ce9b2e47d0f5bfae018c0f55eaf1724535"; + sha256 = "ebbc2843eedaf5ef42e8d9b53e2e7c020e3eefaccbfa9d95554d259ea2332781"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/br/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/br/thunderbird-128.6.0esr.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "31f304b50b271b421917c8332aeeff2c9d9d9e9b4b337e97ad78ccfa0e4401e5"; + sha256 = "5c0679c6970f2e7d80fd4e1b78643e912d42641a287074ec8deb6f49016844fd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/ca/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ca/thunderbird-128.6.0esr.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "7c2721b495ff2443d3794ec19b21a752b88aef08831d721e6f3ff35ce4e0b872"; + sha256 = "d1d727eee4d58c7798414510918248b37d33ba5953243b6e23e7a03fe7c5dab3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/cak/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/cak/thunderbird-128.6.0esr.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "31fd01ff374b25611197b1e9fb378618e5066013dc8df66e7ee84906b044c859"; + sha256 = "e9e6fa54db1a01d8a9fdaf3339dbbf84fb101220e57fe060df44e045a6051189"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/cs/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/cs/thunderbird-128.6.0esr.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "502a20d0747688204f10f30058c4f21d76cf8eb49a3e5726ba1ae26ec9b532d6"; + sha256 = "f1e2399413bf3a744128cb9e2279b9f207f9361c5da3bdb4f7f625f73d2217a6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/cy/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/cy/thunderbird-128.6.0esr.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "0a279418554ff4deb6aac8c5cb62c266aeb6209bb245aad015f9de82989f9bda"; + sha256 = "33a3372f67b1254dbb30989879a71b0078a2340901875abb9759780d81855712"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/da/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/da/thunderbird-128.6.0esr.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "8fa04d1674a222a4eeac58c6c2e3afe30042d72c7c10493551957d2d871b873d"; + sha256 = "2a08ff6af580d47bf2e5759dba6d706bdd3fc74e7d7b6e56b4333c4b7aae9ace"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/de/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/de/thunderbird-128.6.0esr.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "ec8aa2bf5b5657449af6e049b3df61acdac3a01eec44a4b9440976f30168de2b"; + sha256 = "66eaf15fd54ecd204510e3ee8e6042515932138464d12e31f287008c1abc8218"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/dsb/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/dsb/thunderbird-128.6.0esr.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "82ab756c6dec629648f8952e7044b80c3aceae0931f7189a71f9f06d8b122f0d"; + sha256 = "2febaf2c4fb0e75b78bffd4c81b2818c63fe993451b0a7cc20a7e6353dd8fb07"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/el/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/el/thunderbird-128.6.0esr.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "788bb267bacc034be69f118abaca5455df85c4102809435fad11183b8671c089"; + sha256 = "165b23be9f875111a17807edcf6813fc8687773827b85e9c73475590ccab5412"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/en-CA/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/en-CA/thunderbird-128.6.0esr.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "f7c260e808372c8598eeff0b25c6a2689a159bcbce9c1491e526eb5c1934200e"; + sha256 = "001af04eedd973468bfac7a2357bf145fc507bbf710d2ec236fb841d1b31309b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/en-GB/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/en-GB/thunderbird-128.6.0esr.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "69bafaf9013de6392e2a61e9a1301b2055a827377fcb4193f5d8f3385ebd1031"; + sha256 = "f45125ce2e23318ae0d9943e15c6212a4238777fede7af7686f826ee3d9dbe28"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/en-US/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/en-US/thunderbird-128.6.0esr.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "2444f0fa336074cb705f8409c2c914bcd840fb57cb1bac0305129f2c7d8f45a0"; + sha256 = "d9c2e45e91c927832fa2b6affaccfed77a48f83cba647a895b49eaeeaa4461ec"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/es-AR/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/es-AR/thunderbird-128.6.0esr.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "756bcb118f0948d38f9f4215c03d5b92ebd1ec30d45180267f13d81f6309d128"; + sha256 = "39fccbc25a74ab3ced790c034bfa170d1b9f4eb312ad8a9c3f7e1ad77d427c51"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/es-ES/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/es-ES/thunderbird-128.6.0esr.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "f301fa04e3f89df0edd7150c61ee6eeee82bf571f7121cf94111d0fd7cd4209d"; + sha256 = "03741e6cdbb65a7f5915bf57b109cf6adf5213abc20da905fc861c88f9c9c406"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/es-MX/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/es-MX/thunderbird-128.6.0esr.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "035ad8e689822227e85c9690ddfe22402ca551809205c9b485496dc8576eb75e"; + sha256 = "15c7d464ff7769701d314f13330271ed2937ab0b0034a81161b2e36d283831be"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/et/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/et/thunderbird-128.6.0esr.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "24a2851b9db216b4b45da278e7fd2db82624c2039b665cf2e25e98110ae4ad7c"; + sha256 = "2f388016a416978bd4459f10c627d380fffbeff95dcc4f652ad459ea77a114af"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/eu/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/eu/thunderbird-128.6.0esr.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "b633fd9b5f200854f2e361bc1ea90470f3b6e9d29cf5b07f103cdcf0aa95572b"; + sha256 = "913e9a6f0c642488a6f265aeb82f47cad6d9da4c8a3c20a538be4dacfdd2f424"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/fi/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/fi/thunderbird-128.6.0esr.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "068291c36973cb27c2917111b3a7780813642f8ea43590ad08b23ed335db1347"; + sha256 = "181c0036ea5c3cd1d2a51c1f554be95c780d825c2b698196f21ce4451242069a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/fr/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/fr/thunderbird-128.6.0esr.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "df21298f329e384f6015a360623f8b18764fa5ddf7a244ca6d0c4996d7d08db0"; + sha256 = "4855ccbf98d16a50f5b879ca7488b850a2d4378610c1a45e292e1635b3e5836c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/fy-NL/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/fy-NL/thunderbird-128.6.0esr.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "b5d4d630f78aba4ac22c927f9fccb369fa6a3195c08194acc6803109f694af51"; + sha256 = "f1e518d037905d175b67ea69524f9347b1cf84bddfaac15c9755de319cc8cee6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/ga-IE/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ga-IE/thunderbird-128.6.0esr.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "bafd5855e5f7294cb0d65da815bba95ec58c47c5c4f23388ac880bf40f9366dd"; + sha256 = "a1b6fdd4a59fece7a9216c8684502634bdae34a23ad6b1d4a9b1877aa8c74b2f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/gd/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/gd/thunderbird-128.6.0esr.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "4108d67237968c50dec960d5eafa40c5440c22c2641e1b5817996cf72320dfb7"; + sha256 = "770e304815467dcd557a9377f7755ab6eeef1b754db35865102e148d181c24bd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/gl/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/gl/thunderbird-128.6.0esr.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "90aa4b515967efab34fa951a94ae7a710a1e7dfe3789fbf9f56467acce743d82"; + sha256 = "715aa396a68625b69ab3d19133023c2b8623074bcbf60198d278e48d655562f7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/he/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/he/thunderbird-128.6.0esr.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "a30e92e3e01353d87b6d21543f54e1e04cdc5d311b51d31f0f67d528c9cb272a"; + sha256 = "71851abff423cd15633b014ed49fc340a668f37912813180087bec647ef52695"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/hr/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/hr/thunderbird-128.6.0esr.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "27201a23cbcca4e6cd50418942b31628795e1fcb564f2a39d7970c7daf5af6b5"; + sha256 = "ec3b050dd285b5ef797de74003f5661bb4157bc4db5dabd195f1973cf0c6f5bf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/hsb/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/hsb/thunderbird-128.6.0esr.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "06e5a0c6c8615c87355cf3605a87101ffd0664d3a10f866d2282cb9d14211277"; + sha256 = "84d25c5f124a159ce9d6f0e2909c2813857c7efe38dd2f0df5b383f8f7e3d494"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/hu/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/hu/thunderbird-128.6.0esr.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "7f7f68ed7ec1c1de0562662169c609412a7f70421161ac8926bd1c8e7f8b0853"; + sha256 = "ae2566441c6bdd4705dc24d3b917c8e03d7219650b38fbf94d94ff82a446fe62"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/hy-AM/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/hy-AM/thunderbird-128.6.0esr.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "cee500cfb8c1c5ec46ae167c4028479f33e9589e2f79d36bbed6307d4ad8cc44"; + sha256 = "684d92cba150239ba8f7c85cc00b8002a4f86c310c3a96cadc8afa4a8212337a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/id/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/id/thunderbird-128.6.0esr.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "f73fcdfdfe1bbd483b851d7882d8c508ba29c2c8bd5a1c76f0c1ac9e85cb182e"; + sha256 = "f0be4128db7336c6d42880515d7006d6818e2650dc024e65aad6cd0e2be0e961"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/is/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/is/thunderbird-128.6.0esr.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "396174a76aa731129a992e165d288e8ef48c8ad8b1112c8e2b1fd3cf63d8c43f"; + sha256 = "a141c3fb553a32f9874ed6f2a4004e84979d1b970c17fa7a74a6d23fce0263c9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/it/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/it/thunderbird-128.6.0esr.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "69bcbf12b74fd6a437bb435107c93bbba031452d225f8ab16f443f4f56f6d9ad"; + sha256 = "bbc2a5d84e0ed6bebd8585df3a852fbf92e5bb0f548ae37b970a6b2447c98ed1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/ja/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ja/thunderbird-128.6.0esr.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "77040ab2fe50cd59127effd5727b6fbacd6e15d55d20c55016086a220236a9ee"; + sha256 = "d04fc2f0a0ce0be61012ae72dba8c48fe90bd6467ca20d8440787260f92dffcc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/ka/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ka/thunderbird-128.6.0esr.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "d71139c1718d98565be56073cad10a34060c705ef0f6a387b05bd5fd3e6971e1"; + sha256 = "ed178358c17b02499d4b7691098c07c85cfbe4a43cb9bb8b5fd86ce7779298ae"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/kab/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/kab/thunderbird-128.6.0esr.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "4db2df253866f81f88843e5f0e5f451dd28a8ea070f897e574eb8fd740dddb31"; + sha256 = "3299c8a36adc7af99a3c73863645eb622e2b46de84f404233443d00b416e204c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/kk/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/kk/thunderbird-128.6.0esr.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "962831077ceeb6edbda3c934fd390bf1d3f1288932ff4d64623d01dc7b494993"; + sha256 = "1de2bac82f5be71751eef5bfeb59116927ea04b2b8c2b568fe1725745d160e85"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/ko/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ko/thunderbird-128.6.0esr.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "79d9b7d80a91ed7d3d6a9fbaf0e5f4908232ba1d07cb7f418216865ad10289d9"; + sha256 = "0326665b85426f1b14216e063118796e010969689d2341469bbf36d799f2f4a5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/lt/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/lt/thunderbird-128.6.0esr.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "744153437c8ed2af20906d12b2dc8d57aa455726c880a347969a9c7a7ecc0a38"; + sha256 = "458467e5d24267011aa9b2c61cccb77b174bd17b791ab8ab260a7e07b0059ce2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/lv/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/lv/thunderbird-128.6.0esr.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "61c4a370c6b12dc048b067fadf6dfaa718d9c70d6502e06443aafac3c5acb567"; + sha256 = "935564c24ad59a8cba9388c0629c5074738d9671dfc95c3058adf5f0ffae465e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/ms/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ms/thunderbird-128.6.0esr.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "246e7f0d1287e90bb309a62a16953dfd517ea681b7257733154d73101f3a4dc1"; + sha256 = "d98f64f31ed2c2f2c5d6b044bfa64f342f326e9710da9e8884ece1010cd7482c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/nb-NO/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/nb-NO/thunderbird-128.6.0esr.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "9a4c223b26430b0222e615a3833ee5f1ad7958a7872f806bb12673d7a9c0e728"; + sha256 = "14302cbe97ac0fcdfc3fa480f2b4437764be824dd0ab500c2c6c73701f4dedca"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/nl/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/nl/thunderbird-128.6.0esr.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "28311076a854d1dc9eafb7e558955e68c78dd2a75079199316aa005e52279696"; + sha256 = "8b5bb83eeab32207258366e9bd286c2b1b2cd729ef45abf41277f473baa7305f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/nn-NO/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/nn-NO/thunderbird-128.6.0esr.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "2b2b3f5745b358c374b7b23d5c8ce3054ed3c9a05978f90d8cbc41e19df44827"; + sha256 = "9417b5870546bd223de53ec36c17a4d0e2210fcbb4b853abb2f034b74a589051"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/pa-IN/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/pa-IN/thunderbird-128.6.0esr.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "866aac01aef4602fcd0fbfda56e216647701e6b4b4b0fea7de59a0571f5e2890"; + sha256 = "0405871e0fbbda68cbdeb933c70c26d7c0cab0c4501b8762c7be3bd148e08ab8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/pl/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/pl/thunderbird-128.6.0esr.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "a8b67a1ca2c1009e95e536e953eac807add88c4e97b5408e203cd3b07e1bd3d7"; + sha256 = "1da36203c8420749724bd8b32e1c215257a225aa98f0e0643d0425b32aec5980"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/pt-BR/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/pt-BR/thunderbird-128.6.0esr.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "73b32d26cdd9c58cfcb2f100e54dbeed32e4b22ebdc4e77826b4b48e84f69fce"; + sha256 = "cac9cd2269f7d69c25ca618864bfd115bcb2ec27331038b7c6e5831f941499ee"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/pt-PT/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/pt-PT/thunderbird-128.6.0esr.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "70ec94a2c4f1bacb8f2be1845f9899dd04120a032c5a1a3af7d7ad8139f4b3f1"; + sha256 = "d66daca210cb2459850b554d492d4c0ba7d9fc7a34980ee72cfe983436861194"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/rm/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/rm/thunderbird-128.6.0esr.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "d3c1b500388ab3a3a9bc8598509a299d3e053cf90f7638130bb15d0bef65a161"; + sha256 = "dfdc1b27313897e4ae7437423d70a93b47c3277ff5199a7f134e90c787a6f5f4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/ro/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ro/thunderbird-128.6.0esr.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "f309aa8ddf0a825c96c4de792386532a71690b3ee6b4151fc0c468d9067e3d04"; + sha256 = "477a37e982f00f32f7afd9e1263035f878034bc6ee79200cc3d156efc20dc124"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/ru/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ru/thunderbird-128.6.0esr.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "784f3df223bb5f6ee7870c6d2f752ab409226183f0f7e8f3d4b1c41ad3867661"; + sha256 = "d94e863b730f86b3c1ffd2004c74d339f72af66b67d098beb51a056e7bc4e58d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/sk/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/sk/thunderbird-128.6.0esr.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "8b0440effa49fd9531ba19f7a3817a81d661a9badb4aff8e6716aceaaa1daedc"; + sha256 = "7fb502e717b62433c10338a140ce724d2bcd6f947c3df140d88ccc7ba17f3f02"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/sl/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/sl/thunderbird-128.6.0esr.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "e80fe7a9baeaa76928524936181d07c083cc62599c318d619124b09030525833"; + sha256 = "8eea3f3ecd02765a286ddb763a1dd305a630d82720569069a239750ba83664d5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/sq/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/sq/thunderbird-128.6.0esr.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "cb2bc3cf4bd306c80e49f9e7483c43835e8a89021a89c6a73053008ba40eeef3"; + sha256 = "8aa055e87b14cca81d25499d196cceed9503e8922e03ee0ea92097dd9ed54d42"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/sr/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/sr/thunderbird-128.6.0esr.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "9778729ba9f0bed6c028588fc2df06eae4ce915996700bce020b507ff69d90e9"; + sha256 = "879683d2bd155f0d764979c148c8024213337ff110e9b43bb45d6012f229a300"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/sv-SE/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/sv-SE/thunderbird-128.6.0esr.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "c3fd2fca4880c2ad42f5b15b768eb7060ab45a03e4edf0db697c20f4c91b5bca"; + sha256 = "add729440a5acacbdb9303b975196ccd081fbaf609a5ca520c5c49da8a57fbfe"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/th/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/th/thunderbird-128.6.0esr.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "136e1636a016138d252655f08b773d95c08759c77b4a16afac08b21ca89599de"; + sha256 = "b7dfb1c4471c6afe6ff84c15f868254d6871a32e9d989a085cfea3431e592b49"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/tr/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/tr/thunderbird-128.6.0esr.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "132b33f801a11fc6ae19ce7fc7cd34b448f6115db23c3e7426050e60cbfc8d5a"; + sha256 = "55291db94cdbd0ba57ec3235a02dc06e3003240f0f9f95dba028a0fa6193e3d5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/uk/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/uk/thunderbird-128.6.0esr.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "62e8713ce1a2259433951df6c232b18f90793698abd57cc9bc28e80da95fa371"; + sha256 = "07ca8084dd890216f576f612f5540333f222496c061172e2bca55a97949ff199"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/uz/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/uz/thunderbird-128.6.0esr.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "33ec7f20edf12d33c45377129330949b0fab1e0bd379aee48bdab685a2856f4b"; + sha256 = "d0374a986585bd43e7e2ff88ce8c6fee727523ec98983fbcb665acf32327e2d0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/vi/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/vi/thunderbird-128.6.0esr.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "11596e965c414b75ccd29c05fbac9fc8b3597690ef01e3d46c644b4fe05f8639"; + sha256 = "147b9d64d517142fc20c91de1b5613a2c56976fa6c70382abee69dc98ad2a703"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/zh-CN/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/zh-CN/thunderbird-128.6.0esr.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "d2c1ab05c576fe3325b9b7f172a72bdefa8c5371165f4cbe50301c582473d450"; + sha256 = "15cc8573c79e62f611499a0dcd09155e7d5b66c25bf8361132f8ce4a3530897c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.5.2esr/linux-i686/zh-TW/thunderbird-128.5.2esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/zh-TW/thunderbird-128.6.0esr.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "f3ba1f101bc1cc33fbca683c2d3999e5ee24790a8492f08fd7cfeaea9d451ae5"; + sha256 = "9c5fae7d1ff16246beb284f26461a1cdec93c31bf8b9c0ca12adef2bf9fa7794"; } ]; } From 33f6bdabe3361014d9cc1f94dffc0c8d67016692 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Tue, 14 Jan 2025 14:05:46 +0000 Subject: [PATCH 19/37] nixos/ssh: use correct executable for grep in ssh-askpass-wrapper fix #177503 --- nixos/modules/programs/ssh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index aaaf97ab1347..fbc59c09a68f 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -13,7 +13,7 @@ let askPasswordWrapper = pkgs.writeScript "ssh-askpass-wrapper" '' #! ${pkgs.runtimeShell} -e - eval export $(systemctl --user show-environment | ${pkgs.coreutils}/bin/grep -E '^(DISPLAY|WAYLAND_DISPLAY|XAUTHORITY)=') + eval export $(systemctl --user show-environment | ${lib.getExe pkgs.gnugrep} -E '^(DISPLAY|WAYLAND_DISPLAY|XAUTHORITY)=') exec ${cfg.askPassword} "$@" ''; From 0641d1c500b4f2f621c4a1ea06cace4f107b742a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 14:25:00 +0000 Subject: [PATCH 20/37] netlify-cli: 17.38.0 -> 18.0.0 --- pkgs/development/web/netlify-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/netlify-cli/default.nix b/pkgs/development/web/netlify-cli/default.nix index e5f368684200..f766204b4477 100644 --- a/pkgs/development/web/netlify-cli/default.nix +++ b/pkgs/development/web/netlify-cli/default.nix @@ -11,16 +11,16 @@ buildNpmPackage rec { pname = "netlify-cli"; - version = "17.38.0"; + version = "18.0.0"; src = fetchFromGitHub { owner = "netlify"; repo = "cli"; tag = "v${version}"; - hash = "sha256-fK+Z6bqnaqSYXgO0lUbGALZeCiAnvMd6LkMSH7JB7J8="; + hash = "sha256-LGnFVg7c+CMgjxkVdy/rdoo6uU5HaOwGKRDHRe5Hz3Y="; }; - npmDepsHash = "sha256-oFt+l8CigOtm3W5kiT0kFsqKLOJB9ggfiFQgUU5xQ1I="; + npmDepsHash = "sha256-ONLkCbmmY45/sRwaGUWhA187YVtCcdPVnD7ZMFoQ2Y0="; inherit nodejs; From 1b460a179f5fbef7af45100f0163c4435271b7d6 Mon Sep 17 00:00:00 2001 From: misilelab Date: Wed, 15 Jan 2025 00:36:33 +0900 Subject: [PATCH 21/37] gitleaks: 8.22.1 -> 8.23.0 Signed-off-by: misilelab --- pkgs/by-name/gi/gitleaks/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitleaks/package.nix b/pkgs/by-name/gi/gitleaks/package.nix index 3feed5163383..6cd196123def 100644 --- a/pkgs/by-name/gi/gitleaks/package.nix +++ b/pkgs/by-name/gi/gitleaks/package.nix @@ -3,7 +3,6 @@ stdenv, buildGoModule, fetchFromGitHub, - gitleaks, installShellFiles, nix-update-script, versionCheckHook, @@ -11,13 +10,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.22.1"; + version = "8.23.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = "gitleaks"; tag = "v${version}"; - hash = "sha256-PJczVI2/TogRaw+Hs6HibHuwhKwL2scrCpsTQMsHv6Y="; + hash = "sha256-+9aZXjinvDYbPw+yjkQ/BH3LB0xbY1eual/zKoWMlJc="; }; vendorHash = "sha256-hq3v//fhCUOvKPBZ/+YrLIc4nDLxR9Yc+MeIXY7TArA="; From c7a41a299996f30fab0c56eb6bd5d59f7d542f1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 18:54:35 +0000 Subject: [PATCH 22/37] cargo-expand: 1.0.96 -> 1.0.100 --- pkgs/by-name/ca/cargo-expand/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix index 5a3bfaf457f4..22368dfa43e2 100644 --- a/pkgs/by-name/ca/cargo-expand/package.nix +++ b/pkgs/by-name/ca/cargo-expand/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.96"; + version = "1.0.100"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - hash = "sha256-uLJ7XD1m4KreIue+p6Duoa8+DYjhaHagDMmPKcvHZ0I="; + hash = "sha256-nbzQmZ8hAiU8K+/VHwbEniTsioCgQhbADIxV9tL3M1k="; }; - cargoHash = "sha256-XAkEcd/QDw1SyrPuuk5ojqlKHiG28DgdipbKtnlWsGg="; + cargoHash = "sha256-sOxLRNGIHsUBNWWRUo2qyeewL06rU5paq4LbXpksMzg="; meta = with lib; { description = "Cargo subcommand to show result of macro expansion"; From eed788913e86ef8946332aad5e2677d536754db9 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 14 Jan 2025 20:28:42 +0100 Subject: [PATCH 23/37] pam_u2f: 1.3.0 -> 1.3.1 Fixes CVE-2025-23013. Changes: https://github.com/Yubico/pam-u2f/blob/pam_u2f-1.3.1/NEWS --- pkgs/by-name/pa/pam_u2f/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/pam_u2f/package.nix b/pkgs/by-name/pa/pam_u2f/package.nix index 455592a99506..a3606d871278 100644 --- a/pkgs/by-name/pa/pam_u2f/package.nix +++ b/pkgs/by-name/pa/pam_u2f/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "pam_u2f"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "https://developers.yubico.com/pam-u2f/Releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-cjYMaHVIXrTfQJ2o+PUrF4k/BeTZmFKcI4gUSA4RUiA="; + hash = "sha256-mhNUmUf4RPazq2kdca+09vAKRdFl/tJ7AcZsB3UKk4c="; }; nativeBuildInputs = [ pkg-config ]; From 2ab0f7a3ba2ac2013a0032f979ae921ae3d9c19f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Jan 2025 20:45:09 +0100 Subject: [PATCH 24/37] trufflehog: 3.88.1 -> 3.88.2 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.88.1...v3.88.2 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.88.2 --- pkgs/tools/security/trufflehog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index f1234314794e..d5cac504012c 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.88.1"; + version = "3.88.2"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${version}"; - hash = "sha256-peZGCJ3g/u4gAznYM9wzgaqsEYGk0SSzI23g/xglngE="; + hash = "sha256-p5vB9ug/H7xV7Y4GIk2BUUMFJ4/tcKj+V4qvYwCJlRU="; }; vendorHash = "sha256-YsUAu2gEXzpjM/jg4VJ7KTvf1/cLTO04hLOLmUDeYk0="; From 439d736b1b57d1600df03338f9cb87d2088bc3bd Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 30 Dec 2024 22:44:50 +0100 Subject: [PATCH 25/37] python312Packages.pygame-gui: 0612 -> 0613 release: https://github.com/MyreMylar/pygame_gui/releases/tag/v_0613 --- pkgs/development/python-modules/pygame-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix index c9ca90d1ca0f..4b6132f16455 100644 --- a/pkgs/development/python-modules/pygame-gui/default.nix +++ b/pkgs/development/python-modules/pygame-gui/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pygame-gui"; - version = "0612"; + version = "0613"; pyproject = true; # nixpkgs-update: no auto update @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "MyreMylar"; repo = "pygame_gui"; tag = "v_${version}"; - hash = "sha256-6Ps3pmQ8tYwQyv0TliOvUNLy3GjSJ2jdDQTTxfYej0o="; + hash = "sha256-vLDl3VcrjjWpw4hLuKmomK6EykF1VK1CGLkEqjNUQ/Q="; }; nativeBuildInputs = [ setuptools ]; From cfb2542d54202ed6dbb1341f34a542eb47839f9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Jan 2025 00:52:21 +0000 Subject: [PATCH 26/37] api-linter: 1.67.6 -> 1.68.0 --- pkgs/by-name/ap/api-linter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ap/api-linter/package.nix b/pkgs/by-name/ap/api-linter/package.nix index 16847eb016d4..6e77539b60cc 100644 --- a/pkgs/by-name/ap/api-linter/package.nix +++ b/pkgs/by-name/ap/api-linter/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "api-linter"; - version = "1.67.6"; + version = "1.68.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-Dp5bZu9/wqrBZuups69P/SxK6RAKLSPqYt3TXdxMQss="; + hash = "sha256-pYzdI7bcAPP47K4EKjsAV7UY2RLGX9m3tksYRZeGdTQ="; }; - vendorHash = "sha256-RPw8SPfs/M5ycPxB7eM2BmSYU0kKp/4drBvju0u+eoM="; + vendorHash = "sha256-vdoEMMlFwS+BBd0EsrahVL3ZZE4PHQJP4CNwsqIo5Y8="; subPackages = [ "cmd/api-linter" ]; From 39150a340364766a5a3f8bf5e4de173c61fecaea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Jan 2025 06:10:18 +0000 Subject: [PATCH 27/37] saga: 9.7.0 -> 9.7.1 --- pkgs/by-name/sa/saga/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index 6ccf83617767..d73a00dcd7bb 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "saga"; - version = "9.7.0"; + version = "9.7.1"; src = fetchurl { url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz"; - hash = "sha256-wUj0TvZoL/9miCwVk3eYilYXqczkbgsStCrbKAoeuxw="; + hash = "sha256-ZPJ8OlVEqG/jmRaA7BJRsw3b1X/3tKtRcYTXqfGdJ0I="; }; sourceRoot = "saga-${version}/saga-gis"; From aaee9765ba08066eb10f369fe5f2a65664e3d8cc Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 15 Jan 2025 07:40:34 +0100 Subject: [PATCH 28/37] netlify-cli: pkgs/by-name --- .../default.nix => by-name/ne/netlify-cli/package.nix} | 0 pkgs/{development/web => by-name/ne}/netlify-cli/test.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/web/netlify-cli/default.nix => by-name/ne/netlify-cli/package.nix} (100%) rename pkgs/{development/web => by-name/ne}/netlify-cli/test.nix (100%) diff --git a/pkgs/development/web/netlify-cli/default.nix b/pkgs/by-name/ne/netlify-cli/package.nix similarity index 100% rename from pkgs/development/web/netlify-cli/default.nix rename to pkgs/by-name/ne/netlify-cli/package.nix diff --git a/pkgs/development/web/netlify-cli/test.nix b/pkgs/by-name/ne/netlify-cli/test.nix similarity index 100% rename from pkgs/development/web/netlify-cli/test.nix rename to pkgs/by-name/ne/netlify-cli/test.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68b022b96e8f..621b25388512 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4340,7 +4340,7 @@ with pkgs; }; }); - netlify-cli = callPackage ../development/web/netlify-cli { + netlify-cli = callPackage ../by-name/ne/netlify-cli/package.nix { nodejs = nodejs_20; }; From 6be56a42903ecd329ef655e898fde9d123393ac3 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 27 Dec 2024 22:09:58 -0800 Subject: [PATCH 29/37] =?UTF-8?q?ruby-grpc:=20Only=20apply=20the=20GCC=201?= =?UTF-8?q?4=20patch=20if=20it=E2=80=99s=20not=20upstream?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was upstreamed in v1.65.0-pre1~90; attempting to apply it again after that causes errors. Signed-off-by: Anders Kaseorg --- pkgs/development/ruby-modules/gem-config/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index b6542ebeccc2..b93cdcc2134d 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -407,8 +407,10 @@ in ++ lib.optional (lib.versionAtLeast attrs.version "1.53.0" && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) autoSignDarwinBinariesHook; buildInputs = [ openssl ]; hardeningDisable = [ "format" ]; - env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; - patches = [ + env = lib.optionalAttrs (lib.versionOlder attrs.version "1.68.1") { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + patches = lib.optionals (lib.versionOlder attrs.version "1.65.0") [ (fetchpatch { name = "gcc-14-fixes.patch"; url = "https://boringssl.googlesource.com/boringssl/+/c70190368c7040c37c1d655f0690bcde2b109a0d%5E%21/?format=TEXT"; From 073a6a1c3ac12f7041af079f0325f18562a2f904 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 15 Jan 2025 09:17:51 +0100 Subject: [PATCH 30/37] wasm-bindgen-cli: 0.2.95 -> 0.2.100 --- pkgs/by-name/wa/wasm-bindgen-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wasm-bindgen-cli/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli/package.nix index e705a77dd134..9fd1db1cdcde 100644 --- a/pkgs/by-name/wa/wasm-bindgen-cli/package.nix +++ b/pkgs/by-name/wa/wasm-bindgen-cli/package.nix @@ -9,9 +9,9 @@ stdenv, curl, darwin, - version ? "0.2.95", - hash ? "sha256-prMIreQeAcbJ8/g3+pMp1Wp9H5u+xLqxRxL+34hICss=", - cargoHash ? "sha256-6iMebkD7FQvixlmghGGIvpdGwFNLfnUcFke/Rg8nPK4=", + version ? "0.2.100", + hash ? "sha256-3RJzK7mkYFrs7C/WkhW9Rr4LdP5ofb2FdYGz1P7Uxog=", + cargoHash ? "sha256-tD0OY2PounRqsRiFh8Js5nyknQ809ZcHMvCOLrvYHRE=", }: rustPlatform.buildRustPackage rec { From 7c8d77392cd40aa6ddc8eb673e70bbb03388049e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:19:41 +0100 Subject: [PATCH 31/37] python312Packages.aiohomeconnect: 0.9.0 -> 0.10.0 Diff: https://github.com/MartinHjelmare/aiohomeconnect/compare/refs/tags/v0.9.0...0.10.0 Changelog: https://github.com/MartinHjelmare/aiohomeconnect/blob/refs/tags/v0.10.0/CHANGELOG.md --- pkgs/development/python-modules/aiohomeconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomeconnect/default.nix b/pkgs/development/python-modules/aiohomeconnect/default.nix index 6f98a275bdeb..db12e5436701 100644 --- a/pkgs/development/python-modules/aiohomeconnect/default.nix +++ b/pkgs/development/python-modules/aiohomeconnect/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiohomeconnect"; - version = "0.9.0"; + version = "0.10.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiohomeconnect"; tag = "v${version}"; - hash = "sha256-SHrhlchjyUPhf/LnIHB/b90aglboVArcQ/YTOw1vbII="; + hash = "sha256-3ugV0stIUdFlcjN+Z8N4GBrXbjBfZcYZmd3THSS7oZg="; }; pythonRelaxDeps = [ "httpx" ]; From d9d8c9feb9fc6617d4be0ade4fc5ea2570206bb8 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 31 Dec 2024 22:54:50 +0100 Subject: [PATCH 32/37] sops: 3.9.2 -> 3.9.3 Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/so/sops/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/sops/package.nix b/pkgs/by-name/so/sops/package.nix index 9c37e738853d..aab8f59de88a 100644 --- a/pkgs/by-name/so/sops/package.nix +++ b/pkgs/by-name/so/sops/package.nix @@ -8,16 +8,16 @@ buildGo122Module rec { pname = "sops"; - version = "3.9.2"; + version = "3.9.3"; src = fetchFromGitHub { owner = "getsops"; repo = pname; tag = "v${version}"; - hash = "sha256-v35LRFYdnWigWYlDhrOgSOcCI7SUqJbJHaZvlQ6PC4I="; + hash = "sha256-U8ZJktOSj0JJ70CbXDS3FpNmk07cKnco5w2rt4BnQBU="; }; - vendorHash = "sha256-dnhrZPXZWeU98+dEaFLIdtcLWgIrh47l+WAxe+F+0/I="; + vendorHash = "sha256-+UxngJgKG+gAjnXXEcdXPXQqRcMfRDn4wPeR1IhltC0="; postPatch = '' substituteInPlace go.mod \ From 74f9eb59cc0f2ef36ddab585fbdac4a4e68f0fd9 Mon Sep 17 00:00:00 2001 From: genga Date: Fri, 10 Jan 2025 20:56:03 +0300 Subject: [PATCH 33/37] gomanagedocker: 1.4 -> 1.5 gomanagedocker: add update script gomanagedocker: update --- pkgs/by-name/go/gomanagedocker/package.nix | 39 +++++++++++++++++----- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/go/gomanagedocker/package.nix b/pkgs/by-name/go/gomanagedocker/package.nix index c194f11d4afe..21316305dbc4 100644 --- a/pkgs/by-name/go/gomanagedocker/package.nix +++ b/pkgs/by-name/go/gomanagedocker/package.nix @@ -1,13 +1,17 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, - stdenv, - darwin, + versionCheckHook, + nix-update-script, xorg, + pkg-config, + gpgme, + btrfs-progs, }: let - version = "1.4"; + version = "1.5"; in buildGoModule { pname = "gomanagedocker"; @@ -17,20 +21,39 @@ buildGoModule { owner = "ajayd-san"; repo = "gomanagedocker"; tag = "v${version}"; - hash = "sha256-oM0DCOHdVPJFWgmHF8yeGGo6XvuTCXar7NebM1obahg="; + hash = "sha256-y2lepnhaLsjokd587D0bCEd9cmG7GuNBbbx+0sKSCGA="; }; - vendorHash = "sha256-M/jfQWCBrv7hZm450yLBmcjWtNSCziKOpfipxI6U9ak="; + vendorHash = "sha256-hUlv3i+ri9W8Pf1zVtFxB/QSdPJu1cWCjMbquCxoSno="; - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ]; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + gpgme + btrfs-progs + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ]; ldflags = [ "-s" "-w" ]; + # Mocking of docker and podman containers fails + doCheck = false; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "TUI tool to manage your docker images, containers and volumes"; homepage = "https://github.com/ajayd-san/gomanagedocker"; From 62c7468dbf175539ed7a586424c5b0b4d18adf63 Mon Sep 17 00:00:00 2001 From: genga Date: Wed, 15 Jan 2025 12:06:54 +0300 Subject: [PATCH 34/37] python312Packages.biosppy: init at 2.2.2 --- .../python-modules/biosppy/default.nix | 70 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/development/python-modules/biosppy/default.nix diff --git a/pkgs/development/python-modules/biosppy/default.nix b/pkgs/development/python-modules/biosppy/default.nix new file mode 100644 index 000000000000..0e739754692c --- /dev/null +++ b/pkgs/development/python-modules/biosppy/default.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchFromGitHub, + buildPythonPackage, + setuptools, + bidict, + h5py, + matplotlib, + numpy, + scikit-learn, + scipy, + shortuuid, + six, + joblib, + pywavelets, + mock, + tkinter, + opencv-python, +}: + +buildPythonPackage rec { + pname = "biosppy"; + version = "2.2.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "scientisst"; + repo = "BioSPPy"; + tag = "v${version}"; + hash = "sha256-U0ZftAlRlazSO66raH74o/6eP1RpmuFoA6HJ+xmgKR8="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + opencv-python + bidict + h5py + matplotlib + numpy + scikit-learn + scipy + shortuuid + six + joblib + pywavelets + mock + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ tkinter ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "biosppy" + "biosppy.signals" + "biosppy.synthesizers" + "biosppy.inter_plotting" + "biosppy.features" + ]; + + meta = { + description = "Biosignal Processing in Python"; + homepage = "https://biosppy.readthedocs.io/"; + changelog = "https://github.com/scientisst/BioSPPy/releases/tag/v${version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ genga898 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 326234f325be..63d61d67e262 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1677,6 +1677,8 @@ self: super: with self; { biopython = callPackage ../development/python-modules/biopython { }; + biosppy = callPackage ../development/python-modules/biosppy { }; + biothings-client = callPackage ../development/python-modules/biothings-client { }; biplist = callPackage ../development/python-modules/biplist { }; From 81af87439337ca84156e18a71b2aae7fb59a2451 Mon Sep 17 00:00:00 2001 From: genga Date: Wed, 15 Jan 2025 12:21:10 +0300 Subject: [PATCH 35/37] python312Packages.neurokit2: init at 0.2.10 --- .../python-modules/neurokit2/default.nix | 101 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 103 insertions(+) create mode 100644 pkgs/development/python-modules/neurokit2/default.nix diff --git a/pkgs/development/python-modules/neurokit2/default.nix b/pkgs/development/python-modules/neurokit2/default.nix new file mode 100644 index 000000000000..acbfa7b94929 --- /dev/null +++ b/pkgs/development/python-modules/neurokit2/default.nix @@ -0,0 +1,101 @@ +{ + lib, + stdenv, + fetchFromGitHub, + buildPythonPackage, + setuptools, + pytest, + scipy, + scikit-learn, + pandas, + matplotlib, + requests, + cvxopt, + biosppy, + pytest-cov-stub, + mock, + plotly, + astropy, + coverage, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "neurokit2"; + version = "0.2.10"; + pyproject = true; + + src = fetchFromGitHub { + owner = "neuropsychology"; + repo = "NeuroKit"; + tag = "v${version}"; + hash = "sha256-e/B1JvO6uYZ6iVskFvxZLSSXi0cPep9bBZ0JXZTVS28="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace-fail '"pytest-runner"' '"pytest"' + ''; + + build-system = [ + setuptools + pytest + ]; + + dependencies = [ + scipy + scikit-learn + pandas + matplotlib + requests + cvxopt + biosppy + ]; + + nativeCheckInputs = [ + pytest-cov-stub + mock + plotly + astropy + coverage + pytestCheckHook + ]; + + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # Crash in matplotlib (Fatal Python error: Aborted) + "test_events_plot" + ]; + + disabledTestPaths = [ + # Required dependencies not available in nixpkgs + "tests/tests_complexity.py" + "tests/tests_eeg.py" + "tests/tests_eog.py" + "tests/tests_ecg.py" + "tests/tests_bio.py" + "tests/tests_data.py" + "tests/tests_epochs.py" + "tests/tests_ecg_findpeaks.py" + "tests/tests_eda.py" + "tests/tests_emg.py" + "tests/tests_hrv.py" + "tests/tests_rsp.py" + "tests/tests_ppg.py" + "tests/tests_signal.py" + + # Dependency is broken `mne-python` + "tests/tests_microstates.py" + ]; + + pythonImportsCheck = [ + "neurokit2" + ]; + + meta = { + description = "Python Toolbox for Neurophysiological Signal Processing"; + homepage = "https://github.com/neuropsychology/NeuroKit"; + changelog = "https://github.com/neuropsychology/NeuroKit/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ genga898 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63d61d67e262..8940950d012a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9191,6 +9191,8 @@ self: super: with self; { neuralfoil = callPackage ../development/python-modules/neuralfoil { }; + neurokit2 = callPackage ../development/python-modules/neurokit2 { }; + neuron-full = pkgs.neuron-full.override { python3 = python; }; neuronpy = toPythonModule neuron-full; From 72517a32f460e7b3a7e3265f36f50727e1ea2896 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 15 Jan 2025 08:04:23 +0100 Subject: [PATCH 36/37] mujoco: 3.2.6 -> 3.2.7 Diff: https://github.com/google-deepmind/mujoco/compare/refs/tags/3.2.6...3.2.7 Changelog: https://github.com/google-deepmind/mujoco/releases/tag/3.2.7 --- .../mujoco-system-deps-dont-fetch.patch | 58 ++++--------------- pkgs/by-name/mu/mujoco/package.nix | 26 +++++---- .../python-modules/mujoco/default.nix | 2 +- 3 files changed, 29 insertions(+), 57 deletions(-) diff --git a/pkgs/by-name/mu/mujoco/mujoco-system-deps-dont-fetch.patch b/pkgs/by-name/mu/mujoco/mujoco-system-deps-dont-fetch.patch index c09787ff84c5..a6b90781e001 100644 --- a/pkgs/by-name/mu/mujoco/mujoco-system-deps-dont-fetch.patch +++ b/pkgs/by-name/mu/mujoco/mujoco-system-deps-dont-fetch.patch @@ -1,17 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index eea180c0..efb39178 100644 +index aaac4e38..fe4e9932 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -93,7 +93,7 @@ add_subdirectory(src/render) - add_subdirectory(src/thread) - add_subdirectory(src/ui) - --target_compile_definitions(mujoco PRIVATE _GNU_SOURCE CCD_STATIC_DEFINE MUJOCO_DLL_EXPORTS -DMC_IMPLEM_ENABLE) -+target_compile_definitions(mujoco PRIVATE _GNU_SOURCE MUJOCO_DLL_EXPORTS -DMC_IMPLEM_ENABLE) - if(MUJOCO_ENABLE_AVX_INTRINSICS) - target_compile_definitions(mujoco PUBLIC mjUSEPLATFORMSIMD) - endif() -@@ -118,7 +118,7 @@ target_link_libraries( +@@ -120,7 +120,7 @@ target_link_libraries( lodepng qhullstatic_r tinyobjloader @@ -21,7 +12,7 @@ index eea180c0..efb39178 100644 set_target_properties( diff --git a/cmake/MujocoDependencies.cmake b/cmake/MujocoDependencies.cmake -index 44962272..656beeb8 100644 +index 23e4e71e..33081e00 100644 --- a/cmake/MujocoDependencies.cmake +++ b/cmake/MujocoDependencies.cmake @@ -93,28 +93,36 @@ set(BUILD_SHARED_LIBS @@ -75,7 +66,7 @@ index 44962272..656beeb8 100644 ) FetchContent_GetProperties(marchingcubecpp) -@@ -124,119 +132,158 @@ if(NOT TARGET marchingcubecpp) +@@ -124,119 +132,157 @@ if(NOT TARGET marchingcubecpp) endif() endif() @@ -196,7 +187,6 @@ index 44962272..656beeb8 100644 option(SDFLIB_USE_ASSIMP OFF) option(SDFLIB_USE_OPENMP OFF) option(SDFLIB_USE_ENOKI OFF) -+ findorfetch( USE_SYSTEM_PACKAGE - OFF @@ -285,7 +275,7 @@ index 44962272..656beeb8 100644 set(ABSL_PROPAGATE_CXX_STD ON) # This specific version of Abseil does not have the following variable. We need to work with BUILD_TESTING -@@ -249,15 +296,11 @@ if(MUJOCO_BUILD_TESTS) +@@ -249,15 +295,11 @@ if(MUJOCO_BUILD_TESTS) set(ABSL_BUILD_TESTING OFF) findorfetch( USE_SYSTEM_PACKAGE @@ -302,7 +292,7 @@ index 44962272..656beeb8 100644 TARGETS absl::core_headers EXCLUDE_FROM_ALL -@@ -268,6 +311,9 @@ if(MUJOCO_BUILD_TESTS) +@@ -268,6 +310,9 @@ if(MUJOCO_BUILD_TESTS) CACHE BOOL "Build tests." FORCE ) @@ -312,7 +302,7 @@ index 44962272..656beeb8 100644 # Avoid linking errors on Windows by dynamically linking to the C runtime. set(gtest_force_shared_crt ON -@@ -276,22 +322,20 @@ if(MUJOCO_BUILD_TESTS) +@@ -276,22 +321,20 @@ if(MUJOCO_BUILD_TESTS) findorfetch( USE_SYSTEM_PACKAGE @@ -341,7 +331,7 @@ index 44962272..656beeb8 100644 set(BENCHMARK_EXTRA_FETCH_ARGS "") if(WIN32 AND NOT MSVC) set(BENCHMARK_EXTRA_FETCH_ARGS -@@ -310,15 +354,11 @@ if(MUJOCO_BUILD_TESTS) +@@ -310,15 +353,11 @@ if(MUJOCO_BUILD_TESTS) findorfetch( USE_SYSTEM_PACKAGE @@ -358,7 +348,7 @@ index 44962272..656beeb8 100644 TARGETS benchmark::benchmark benchmark::benchmark_main -@@ -328,15 +368,18 @@ if(MUJOCO_BUILD_TESTS) +@@ -328,15 +367,18 @@ if(MUJOCO_BUILD_TESTS) endif() if(MUJOCO_TEST_PYTHON_UTIL) @@ -382,7 +372,7 @@ index 44962272..656beeb8 100644 ) FetchContent_GetProperties(Eigen3) -@@ -348,6 +391,19 @@ if(MUJOCO_TEST_PYTHON_UTIL) +@@ -348,6 +390,19 @@ if(MUJOCO_TEST_PYTHON_UTIL) set_target_properties( Eigen3::Eigen PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${eigen3_SOURCE_DIR}" ) @@ -479,19 +469,10 @@ index 5141406c..75ff7884 100644 glfw EXCLUDE_FROM_ALL diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 122760a9..ddd90819 100644 +index 0f92803d..da9dce4c 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt -@@ -30,7 +30,7 @@ macro(mujoco_test name) - ) - - add_executable(${name} ${name}.cc) -- target_link_libraries(${name} gtest_main mujoco) -+ target_link_libraries(${name} GTest::gtest_main mujoco) - target_include_directories(${name} PRIVATE ${MUJOCO_TEST_INCLUDE}) - set_target_properties(${name} PROPERTIES BUILD_RPATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) - # gtest_discover_tests is recommended over gtest_add_tests, but has some issues in Windows. -@@ -60,20 +60,20 @@ target_link_libraries( +@@ -81,8 +81,8 @@ target_link_libraries( absl::synchronization absl::flat_hash_map absl::flat_hash_set @@ -502,18 +483,3 @@ index 122760a9..ddd90819 100644 mujoco::mujoco ) target_include_directories(fixture PRIVATE ${mujoco_SOURCE_DIR}/include gmock) - - mujoco_test(fixture_test) --target_link_libraries(fixture_test fixture gmock) -+target_link_libraries(fixture_test fixture GTest::gmock) - - mujoco_test(header_test) --target_link_libraries(header_test fixture gmock) -+target_link_libraries(fixture_test fixture GTest::gmock) - - mujoco_test(pipeline_test) --target_link_libraries(pipeline_test fixture gmock) -+target_link_libraries(fixture_test fixture GTest::gmock) - - add_subdirectory(benchmark) - add_subdirectory(engine) diff --git a/pkgs/by-name/mu/mujoco/package.nix b/pkgs/by-name/mu/mujoco/package.nix index 6396dd95a042..afbb18e0c79c 100644 --- a/pkgs/by-name/mu/mujoco/package.nix +++ b/pkgs/by-name/mu/mujoco/package.nix @@ -1,13 +1,14 @@ { - cereal_1_3_2, - cmake, + lib, + stdenv, fetchFromGitHub, + cmake, fetchFromGitLab, glfw, glm, - lib, spdlog, - stdenv, + cereal_1_3_2, + python3Packages, }: let @@ -35,8 +36,8 @@ let eigen3 = fetchFromGitLab { owner = "libeigen"; repo = "eigen"; - rev = "d34b100c137ac931379ae5e1b888f16a9c8d6c72"; - hash = "sha256-GYjENtobSWCJqRw2GJbxAJDZSdyBNqWkobn2Vm5H53Q="; + rev = "7f2377859377da6f22152015c28b12c04752af77"; + hash = "sha256-SmyvY/WlU9jryD9ZpSw73dQEc9jI4ySQPRnplg/BC4w="; }; googletest = fetchFromGitHub { owner = "google"; @@ -131,7 +132,7 @@ let in stdenv.mkDerivation rec { pname = "mujoco"; - version = "3.2.6"; + version = "3.2.7"; # Bumping version? Make sure to look though the MuJoCo's commit # history for bumped dependency pins! @@ -139,7 +140,7 @@ stdenv.mkDerivation rec { owner = "google-deepmind"; repo = "mujoco"; tag = version; - hash = "sha256-n1H9e+GMqHYsimypF7AiVzHC2dXkL+4FWDEHB5B2ZIE="; + hash = "sha256-TAhgu3h7tCflIMscVS+jYuUfMmIYcCcI3JFxUlj8g9E="; }; patches = [ ./mujoco-system-deps-dont-fetch.patch ]; @@ -177,8 +178,13 @@ stdenv.mkDerivation rec { ln -s ${pin.marchingcubecpp} build/_deps/marchingcubecpp-src ''; - passthru.pin = { - inherit (pin) lodepng eigen3 abseil-cpp; + passthru = { + pin = { + inherit (pin) lodepng eigen3 abseil-cpp; + }; + tests = { + pythonMujoco = python3Packages.mujoco; + }; }; meta = { diff --git a/pkgs/development/python-modules/mujoco/default.nix b/pkgs/development/python-modules/mujoco/default.nix index d9cdea7f38d4..89a31e15a96b 100644 --- a/pkgs/development/python-modules/mujoco/default.nix +++ b/pkgs/development/python-modules/mujoco/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { # in the project's CI. src = fetchPypi { inherit pname version; - hash = "sha256-kl7+5cMvaAaILEARKs5KPtdLE7Kv8J7NddZnj6oLwk8="; + hash = "sha256-a0ATRmtFV11J3T2HSNCZhfc0kAOu8yaHIW0rkCrHsTg="; }; nativeBuildInputs = [ cmake ]; From 1276ef2a55040587e8aa42589b5aa8d9657c3dfc Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 15 Jan 2025 09:52:58 +0100 Subject: [PATCH 37/37] python312Packages.torchrl: add a better comment for skipped test --- pkgs/development/python-modules/torchrl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix index 759ce4b4b5dc..7977725b1d95 100644 --- a/pkgs/development/python-modules/torchrl/default.nix +++ b/pkgs/development/python-modules/torchrl/default.nix @@ -175,7 +175,8 @@ buildPythonPackage rec { "test_gae_param_as_tensor" ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ - # Flaky (AssertionError) + # Flaky + # AssertionError: assert tensor([51.]) == ((5 * 11) + 2) "test_vecnorm_parallel_auto" ];